[packages/xsldbg] update to 4.8.0; library no longer present

glen glen at pld-linux.org
Sat Oct 27 18:36:03 CEST 2018


commit 1b6b27c2877dd91ae2f39cc22ea95cecc14776cc
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sat Oct 27 19:35:21 2018 +0300

    update to 4.8.0; library no longer present
    
    this closes #1

 xsldbg-DESTDIR.patch   |  14 -------
 xsldbg-docpath.patch   |  16 --------
 xsldbg-no-static.patch |  14 -------
 xsldbg.spec            | 104 ++++++++++++++++---------------------------------
 4 files changed, 34 insertions(+), 114 deletions(-)
---
diff --git a/xsldbg.spec b/xsldbg.spec
index 827c3d6..dab280d 100644
--- a/xsldbg.spec
+++ b/xsldbg.spec
@@ -1,23 +1,24 @@
 Summary:	XSLT stylesheets debugger
 Summary(pl.UTF-8):	Odpluskiwacz styli XSLT
 Name:		xsldbg
-Version:	2.1.8
+Version:	4.8.0
 Release:	1
 License:	GPL
 Group:		Development/Debuggers
-Source0:	http://dl.sourceforge.net/xsldbg/%{name}-%{version}.tar.gz
-# Source0-md5:	f9a4a5b834d874afacf35b15cc17ccb1
-Patch0:		%{name}-DESTDIR.patch
-Patch1:		%{name}-no-static.patch
-Patch2:		%{name}-docpath.patch
+Source0:	http://downloads.sourceforge.net/xsldbg/%{name}-%{version}.tar.gz
+# Source0-md5:	e9bf58a2f81c19279ddc9d686a464902
 URL:		http://xsldbg.sourceforge.net/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	Qt5Core-devel
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	libtool
+BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	perl-base
+BuildRequires:	qt5-qmake
 BuildRequires:	readline-devel
+BuildRequires:	rpmbuild(macros) >= 1.596
+Requires:	desktop-file-utils
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,80 +37,43 @@ Ma trzy podstawowe tryby wykonywania styli: uruchomienie całości; krok
 do następnej instrukcji xsl; kontynuacja do następnego punktu stopu
 lub restartu stylu.
 
-%package devel
-Summary:	Headers for %{name}
-Summary(pl.UTF-8):	Pliki nagłówkowe dla %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-Headers and libraries for %{name}. You don't need them, unless you
-want to develop frontends to %{name}.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe dla %{name}. Nie potrzebujesz ich, chyba, że chcesz
-pisać nakładki na %{name}.
-
-%package static
-Summary:	Static libraries for %{name}
-Summary(pl.UTF-8):	Statyczne biblioteki dla %{name}
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static libraries for %{name}. You don't need them, unless you want to
-develop frontends to %{name}.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki dla %{name}. Nie potrzebujesz ich, chyba, że
-chcesz pisać nakładki na %{name}.
-
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-rm -f missing
-%{__libtoolize}
-%{__aclocal}
-autoupdate
-%{__automake}
-%{__autoconf}
-# if anybody is intrested in KDE/GNOME docs, feel free to change it ;)
-%configure \
-	--disable-kde-docs \
-	--disable-gnome-docs \
-	--enable-docs-macro \
-	--with-html-dir=%{_docdir}/%{name}-%{version}
-
+qmake-qt5 \
+	QMAKE_EXTRAS="CONFIG+=xsldbg_shortcut" \
+	-r xsldbg.pro
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
 
-%{__make} -C src install \
-	DESTDIR=$RPM_BUILD_ROOT
+# fixup borked icons path
+install -d $RPM_BUILD_ROOT%{_iconsdir}
+mv $RPM_BUILD_ROOT{%{_prefix}/icons/*,%{_iconsdir}}
+
+# not packaged. doc in kde format
+rm -r $RPM_BUILD_ROOT%{_docdir}/HTML/en/xsldbg
+rm -r $RPM_BUILD_ROOT%{_docdir}/packages/xsldbg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
-
-%files
-%defattr(644,root,root,755)
-%doc README AUTHORS ChangeLog TODO
-%doc docs/en/plain/index.html docs/en/xsldoc.{dtd,xml,xsl}
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %{_bindir}/*
+%post
+%update_desktop_database
+%update_icon_cache hicolor
 
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/*
+%postun
+%update_desktop_database
+%update_icon_cache hicolor
 
-%files static
+%files
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%doc README.md AUTHORS ChangeLog TODO
+%attr(755,root,root) %{_bindir}/xsldbg
+%{_mandir}/man1/xsldbg.1*
+%{_desktopdir}/xsldbg.desktop
+%{_iconsdir}/hicolor/*/apps/xsldbg_source.png
diff --git a/xsldbg-DESTDIR.patch b/xsldbg-DESTDIR.patch
deleted file mode 100644
index 9a54997..0000000
--- a/xsldbg-DESTDIR.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur xsldbg-2.1.8/src/libxsldbg/Makefile.am xsldbg-2.1.8-/src/libxsldbg/Makefile.am
---- xsldbg-2.1.8/src/libxsldbg/Makefile.am	Fri Apr  5 20:28:54 2002
-+++ xsldbg-2.1.8-/src/libxsldbg/Makefile.am	Sat Apr 20 15:42:41 2002
-@@ -110,8 +110,8 @@
- lib_LTLIBRARIES = libxsldbg.la
- 
- install-exec-hook:
--	if test ! -d $(prefix)/include/libxsldbg ; then  $(mkinstalldirs) $(prefix)/include/libxsldbg ; fi
--	$(INSTALL_DATA) $(noinst_HEADERS) $(prefix)/include/libxsldbg
-+	if test ! -d $(DESTDIR)$(prefix)/include/libxsldbg ; then  $(mkinstalldirs) $(DESTDIR)$(prefix)/include/libxsldbg ; fi
-+	$(INSTALL_DATA) $(noinst_HEADERS) $(DESTDIR)$(prefix)/include/libxsldbg
- 
- clean:
- 	rm -f *.o
diff --git a/xsldbg-docpath.patch b/xsldbg-docpath.patch
deleted file mode 100644
index 150271f..0000000
--- a/xsldbg-docpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur xsldbg-2.1.8-/src/libxsldbg/Makefile.am xsldbg-2.1.8/src/libxsldbg/Makefile.am
---- xsldbg-2.1.8-/src/libxsldbg/Makefile.am	Sat Apr 20 16:46:32 2002
-+++ xsldbg-2.1.8/src/libxsldbg/Makefile.am	Sat Apr 20 16:46:59 2002
-@@ -1,10 +1,10 @@
- # set the include path found by configure
- # cheet a bit because I need DOCS_PATH defined
- if USE_XSLDBG_AS_THREAD
--INCLUDES= $(all_includes) -DDOCS_PATH=\"$(HTML_DIR)/xsldbg/\" \
-+INCLUDES= $(all_includes) -DDOCS_PATH=\"$(HTML_DIR)/\" \
-  -DVERSION=\"@VERSION@\" -I .. $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) -I $(QTDIR)/include
- else
--INCLUDES= $(all_includes) -DDOCS_PATH=\"$(HTML_DIR)/xsldbg/\" \
-+INCLUDES= $(all_includes) -DDOCS_PATH=\"$(HTML_DIR)/\" \
-  -DVERSION=\"@VERSION@\" -I .. $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
- endif
- 
diff --git a/xsldbg-no-static.patch b/xsldbg-no-static.patch
deleted file mode 100644
index a7815e1..0000000
--- a/xsldbg-no-static.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur xsldbg-2.1.8/configure.in xsldbg-2.1.8-/configure.in
---- xsldbg-2.1.8/configure.in	Sun Apr  7 16:08:52 2002
-+++ xsldbg-2.1.8-/configure.in	Sat Apr 20 15:40:25 2002
-@@ -561,7 +561,9 @@
- 	XSLDBG_STATIC_FLAGS=
- 	AC_MSG_RESULT(Disabling static build of xsldbg)
- else
--	XSLDBG_STATIC_FLAGS=" -static"
-+#	XSLDBG_STATIC_FLAGS=" -static"
-+#	we don't want static
-+	XSLDBG_STATIC_FLAGS=
- fi
- 
- AC_SUBST(XSLDBG_STATIC_FLAGS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xsldbg.git/commitdiff/1b6b27c2877dd91ae2f39cc22ea95cecc14776cc



More information about the pld-cvs-commit mailing list