packages: poldek/poldek.spec, poldek/poldek-am.patch (NEW)=?UTF-8?Q?=20?=- added am patch...

qboosh qboosh at pld-linux.org
Fri Jun 15 19:23:32 CEST 2012 

Author: qboosh                       Date: Fri Jun 15 17:23:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added am patch (fixes build with automake 1.12)
- explicit autotools calls instead of autoreconf, explicit files in system dirs
- support rpmcppflags
- use __rm macro where appropriate, removed one obsolete rm command
- package pc file for tndb

---- Files affected:
packages/poldek:
   poldek.spec (1.448 -> 1.449) , poldek-am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.448 packages/poldek/poldek.spec:1.449
--- packages/poldek/poldek.spec:1.448	Fri Apr  6 12:00:40 2012
+++ packages/poldek/poldek.spec	Fri Jun 15 19:23:26 2012
@@ -46,6 +46,7 @@
 Patch2:		%{name}-size-type.patch
 Patch3:		%{name}-Os-fail-workaround.patch
 Patch4:		%{name}-git.patch
+Patch5:		%{name}-am.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -208,8 +209,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
-rm -f m4/libtool.m4 m4/lt*.m4
+%{__rm} m4/libtool.m4 m4/lt*.m4
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -223,13 +225,19 @@
 %{__automake}
 cd tndb
 %{__libtoolize}
-autoreconf -i
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
 cd ../trurlib
 %{__libtoolize}
-autoreconf -i
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
 cd ..
 
-CPPFLAGS="-std=gnu99"
+CPPFLAGS="%{rpmcppflags} -std=gnu99"
 %configure \
 	%{?with_static:--enable-static --disable-shared} \
 	%{!?with_imode:--disable-imode} \
@@ -251,7 +259,7 @@
 	libdir=%{py_sitedir}
 %endif
 
-%{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
+%{?with_static:%{__rm} $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
 %ifarch i486 i686 ppc sparc alpha athlon
 	%define		_ftp_arch	%{_target_cpu}
@@ -330,7 +338,7 @@
 %endif
 
 # sources we don't package
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,pld,fedora,centos}-source.conf
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora,centos}-source.conf
 # include them in %doc
 rm -rf configs
 cp -a conf configs
@@ -338,7 +346,7 @@
 
 %if %{with python}
 %py_postclean
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/_poldekmod.la
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_poldekmod.la
 %endif
 
 %find_lang %{name}
@@ -446,10 +454,12 @@
 %dir %{_sysconfdir}/%{name}/repos.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/repos.d/*.conf
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/ipoldek
+%attr(755,root,root) %{_bindir}/poldek
+%attr(755,root,root) %{_bindir}/rpmvercmp
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*
-%{_mandir}/man1/%{name}*
+%{_mandir}/man1/%{name}*.1*
 %lang(pl) %{_mandir}/pl/man1/%{name}*
 %{_infodir}/poldek.info*
 %if %{with imode}
@@ -475,13 +485,28 @@
 
 %files devel
 %defattr(644,root,root,755)
-%{!?with_static:%attr(755,root,root) %{_libdir}/lib*.so}
-%{_libdir}/lib*.la
-%{_includedir}/*
+%if %{without static}
+%attr(755,root,root) %{_libdir}/libpoclidek.so
+%attr(755,root,root) %{_libdir}/libpoldek.so
+%attr(755,root,root) %{_libdir}/libtndb.so
+%attr(755,root,root) %{_libdir}/libtrurl.so
+%attr(755,root,root) %{_libdir}/libvfile.so
+%endif
+%{_libdir}/libpoclidek.la
+%{_libdir}/libpoldek.la
+%{_libdir}/libtndb.la
+%{_libdir}/libtrurl.la
+%{_libdir}/libvfile.la
+%{_includedir}/poldek
+%{_includedir}/tndb
+%{_includedir}/trurl
+%{_includedir}/vfile
+%{_pkgconfigdir}/tndb.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libtndb.a
+%{_libdir}/libtrurl.a
 
 %if %{with python}
 %files -n python-poldek
@@ -497,6 +522,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.449  2012/06/15 17:23:26  qboosh
+- added am patch (fixes build with automake 1.12)
+- explicit autotools calls instead of autoreconf, explicit files in system dirs
+- support rpmcppflags
+- use __rm macro where appropriate, removed one obsolete rm command
+- package pc file for tndb
+
 Revision 1.448  2012/04/06 10:00:40  arekm
 - rel 11; -j1 untill poldek.conf trashing is correctly fixed
 

================================================================
Index: packages/poldek/poldek-am.patch
diff -u /dev/null packages/poldek/poldek-am.patch:1.1
--- /dev/null	Fri Jun 15 19:23:32 2012
+++ packages/poldek/poldek-am.patch	Fri Jun 15 19:23:26 2012
@@ -0,0 +1,50 @@
+--- poldek-0.30/conf/Makefile.am.orig	2012-03-20 21:41:46.000000000 +0100
++++ poldek-0.30/conf/Makefile.am	2012-06-15 18:19:28.195427542 +0200
+@@ -25,7 +25,7 @@
+ 	$(SHELL) $(top_srcdir)/doc/conf-xml2.sh conf $(top_srcdir)/doc/poldek.conf.xml poldek
+ 
+ install-data-local: $(GENCONFIGS)
+-	 $(mkdir_p) $(DESTDIR)$(sysconfdir)/$(PACKAGE)/repos.d
++	 $(MKDIR_P) $(DESTDIR)$(sysconfdir)/$(PACKAGE)/repos.d
+ 	 for a in $(CONFIGS); do \
+ 	 	$(INSTALL_DATA) $(srcdir)/$$a $(DESTDIR)$(sysconfdir)/$(PACKAGE); \
+ 	 done
+--- poldek-0.30/doc/Makefile.am.orig	2012-03-20 21:41:46.000000000 +0100
++++ poldek-0.30/doc/Makefile.am	2012-06-15 18:18:42.875429444 +0200
+@@ -69,7 +69,7 @@
+ 	xmlto --skip-validation -m $(srcdir)/NEWS.xsl -m $(srcdir)/manual-web.xsl xhtml-nochunks NEWS.docb.tmp && mv NEWS.docb.html $@
+ 
+ $(MANUAL_XHTMLDIR): $(abs_builddir)/manual.xml.xhtml.tmp
+-	$(mkdir_p) $(MANUAL_XHTMLDIR)
++	$(MKDIR_P) $(MANUAL_XHTMLDIR)
+ 	rm -f $(MANUAL_XHTMLDIR)/*.*
+ 	xmlto --skip-validation -m $(srcdir)/manual.xsl -o $(MANUAL_XHTMLDIR) xhtml $<
+ # remove empty indexterm's (I'm docbook novice)
+@@ -78,7 +78,7 @@
+ 
+ # as above but with manual-web.xsl
+ manual-web: $(abs_builddir)/manual.xml.xhtml.tmp
+-	$(mkdir_p) manual-web
++	$(MKDIR_P) manual-web
+ 	rm -f manual-web/*.*
+ 	xmlto --skip-validation -m $(srcdir)/manual.xsl -m $(srcdir)/manual-web.xsl -o manual-web xhtml $<
+ # remove empty indexterm's (I'm docbook novice)
+@@ -108,7 +108,7 @@
+ 	-rm -f core *.o *.bak *~ *% *\# TAGS gmon.out \#* *\# poldek.html *.tmp
+ 
+ install-exec-hook:
+-	$(mkdir_p) "$(DESTDIR)$(infodir)"
++	$(MKDIR_P) "$(DESTDIR)$(infodir)"
+ 	$(INSTALL_DATA) $(srcdir)/poldek.info $(DESTDIR)$(infodir)
+ 
+ uninstall-hook:
+--- poldek-0.30/configure.ac.orig	2012-03-20 21:41:46.000000000 +0100
++++ poldek-0.30/configure.ac	2012-06-15 18:19:58.392092942 +0200
+@@ -53,6 +53,7 @@
+ AC_C_INLINE
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++AC_PROG_MKDIR_P
+ AC_CHECK_PROG(POD2MAN, pod2man, pod2man)
+ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION(0.11.5)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/poldek/poldek.spec?r1=1.448&r2=1.449

More information about the pld-cvs-commit mailing list