SPECS (AC-branch): poldek.spec - includedir repos.d backport; rel 16

[glen]

Author: glen                         Date: Mon Mar 24 21:43:21 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- includedir repos.d backport; rel 16

---- Files affected:
SPECS:
   poldek.spec (1.277.2.3.2.18.2.7 -> 1.277.2.3.2.18.2.8) 

---- Diffs:

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.277.2.3.2.18.2.7 SPECS/poldek.spec:1.277.2.3.2.18.2.8
--- SPECS/poldek.spec:1.277.2.3.2.18.2.7	Wed Mar 19 20:41:47 2008
+++ SPECS/poldek.spec	Mon Mar 24 22:43:16 2008
@@ -8,7 +8,7 @@
 %define	ver_db	4.2.50-1
 %define	ver_rpm	4.4.9-31
 %define	snap	20070703.00
-%define	rel		15
+%define	rel		16
 Summary:	RPM packages management helper tool
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:		poldek
@@ -36,6 +36,7 @@
 Patch10:	%{name}-reversed-prompt.patch
 Patch11:	%{name}-abort-on-upgrade.patch
 Patch12:	%{name}-nonoorder.patch
+Patch13:	%{name}-bug-79.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -176,6 +177,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p0
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -196,7 +198,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -252,7 +254,7 @@
 %endif
 
 # get rid of non-pld sources
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora}-source.conf
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora,centos}-source.conf
 # include them in %doc
 rm -rf configs
 cp -a conf configs
@@ -321,10 +323,20 @@
 	fi
 fi
 
+%triggerpostun -- poldek < 0.21-0.20070703.00.15.7
+if ! grep -q '^%%includedir' %{_sysconfdir}/%{name}/poldek.conf; then
+	%{__sed} -i -e '/^%include %%{_distro}-source.conf/{
+		a
+		a# /etc/poldek/repos.d/*.conf
+		a%includedir repos.d
+	}' %{_sysconfdir}/%{name}/poldek.conf
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README* NEWS TODO configs/
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/%{name}/repos.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/%{name}
@@ -340,7 +352,16 @@
 %if !%{with static}
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%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.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpoclidek.so.0
+%attr(755,root,root) %ghost %{_libdir}/libpoldek.so.2
+%attr(755,root,root) %ghost %{_libdir}/libtndb.so.0
+%attr(755,root,root) %ghost %{_libdir}/libtrurl.so.0
+%attr(755,root,root) %ghost %{_libdir}/libvfile.so.0
 %endif
 
 %files devel
@@ -367,6 +388,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.277.2.3.2.18.2.8  2008-03-24 21:43:16  glen
+- includedir repos.d backport; rel 16
+
 Revision 1.277.2.3.2.18.2.7  2008-03-19 19:41:47  glen
 - disable --noorder passing to rpm (vimrc loss was probably due same problem); rel 15
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/poldek.spec?r1=1.277.2.3.2.18.2.7&r2=1.277.2.3.2.18.2.8&f=u