Author: glen Date: Thu Mar 27 16:48:02 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged repos.d support from AC-branch; rel 1
---- Files affected:
SPECS:
poldek.spec (1.323 -> 1.324)
---- Diffs:
================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.323 SPECS/poldek.spec:1.324
--- SPECS/poldek.spec:1.323 Thu Mar 27 17:23:10 2008
+++ SPECS/poldek.spec Thu Mar 27 17:47:57 2008
@@ -10,7 +10,7 @@
%define ver_rpm 4.4.9-1
#
%define snap 20080225.00
-%define rel 0.5
+%define rel 1
Summary: RPM packages management helper tool
Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM
Name: poldek
@@ -27,7 +27,7 @@
Source5: %{name}.png
Patch1: %{name}-vserver-packages.patch
Patch2: %{name}-config.patch
-Patch3: %{name}-multilib.patch
+
Patch4: %{name}-bug117hack.patch
Patch5: %{name}-missing-symbol.patch
Patch6: %{name}-abort-on-upgrade.patch
@@ -156,9 +156,6 @@
%setup -q -n %{name}-%{version}%{?snap:-cvs%{snap}}
%patch1 -p1
%patch2 -p1
-%ifarch %{x8664}
-%patch3 -p1
-%endif
%patch4 -p0
%patch5 -p1
%patch6 -p1
@@ -217,12 +214,12 @@
sed -e '
s|%%ARCH%%|%{_ftp_arch}|g
-' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-source.conf
+' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
%ifarch %{x8664}
sed '
s|%%ARCH%%|%{_ftp_alt_arch}|g
-' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/pld-multilib-source.conf
+' < %{SOURCE2} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
%endif
install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aliases.conf
@@ -234,8 +231,8 @@
install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
%endif
-# get rid of non-pld sources
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora,centos}-source.conf
+# sources we don't package
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,pld,fedora,centos}-source.conf
# include them in %doc
rm -rf configs
cp -a conf configs
@@ -304,12 +301,37 @@
fi
fi
+%triggerpostun -- poldek < 0.30-0.20080225.00.1
+if ! grep -q '^%%includedir repos.d' %{_sysconfdir}/%{name}/poldek.conf; then
+ %{__sed} -i -e '/^%%include source.conf/{
+ a
+ a# /etc/poldek/repos.d/*.conf
+ a%%includedir repos.d
+ }' %{_sysconfdir}/%{name}/poldek.conf
+fi
+
+%{__sed} -i -e '/%%include %%{_distro}-source.conf/d'
%{_sysconfdir}/%{name}/poldek.conf
+%{__sed} -i -e '/%%include %%{_distro}-multilib-source.conf/d'
%{_sysconfdir}/%{name}/poldek.conf
+
+if [ -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/%{name}/repos.d/pld.conf{,.rpmnew}
+ mv -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave
%{_sysconfdir}/%{name}/repos.d/pld.conf
+fi
+
+%ifarch %{x8664}
+if [ -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf{,.rpmnew}
+ mv -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave
%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+fi
+%endif
+
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc README* NEWS TODO configs/
+%doc README* NEWS TODO configs
%dir %{_sysconfdir}/%{name}
%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}/*
%dir %{_libdir}/%{name}
%attr(755,root,root) %{_libdir}/%{name}/*
@@ -321,7 +343,7 @@
%{_pixmapsdir}/%{name}.png
%endif
-%if !%{with static}
+%if %{without static}
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpoclidek.so.*.*.*
@@ -360,6 +382,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.324 2008-03-27 16:47:57 glen
+- merged repos.d support from AC-branch; rel 1
+
Revision 1.323 2008-03-27 16:23:10 glen
- simplify ftp arch macro setup
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/poldek.spec?r1=1.323&r2=1.324&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
