SPECS (AC-DEVEL): poldek.spec - catch up with HEAD

[glen]

Author: glen                         Date: Thu Aug 14 16:23:33 2008 GMT
Module: SPECS                         Tag: AC-DEVEL
---- Log message:
- catch up with HEAD

---- Files affected:
SPECS:
   poldek.spec (1.315.2.9 -> 1.315.2.10) 

---- Diffs:

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.315.2.9 SPECS/poldek.spec:1.315.2.10
--- SPECS/poldek.spec:1.315.2.9	Tue Jun 10 12:50:59 2008
+++ SPECS/poldek.spec	Thu Aug 14 18:23:28 2008
@@ -10,7 +10,7 @@
 %define	ver_rpm	4.4.9-1
 #
 %define		snap	20080604.13
-%define		rel		0.2
+%define		rel		0.3
 Summary:	RPM packages management helper tool
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:		poldek
@@ -18,18 +18,21 @@
 Release:	0.%{snap}.%{rel}
 License:	GPL v2
 Group:		Applications/System
+#Source0:	http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
 Source0:	http://carme.pld-linux.org/~megabajt/snaps/poldek/%{name}-%{version}-cvs%{snap}.tar.bz2
 # Source0-md5:	2e1b9bbaf5c39cc626c22978852f6371
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
-Source3:	%{name}-aliases.conf
-Source4:	%{name}.desktop
-Source5:	%{name}.png
+Source5:	%{name}-aliases.conf
+Source6:	%{name}.desktop
+Source7:	%{name}.png
 Patch100:	%{name}-dirdeps.patch
 Patch0:		%{name}-vserver-packages.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-abort-on-upgrade.patch
 Patch3:     %{name}-158fix.patch
+Patch4:		%{name}-inline.patch
+Patch5:		%{name}-ls-llu.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -160,6 +163,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
+%patch4 -p1
+%patch5 -p1
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -223,13 +228,13 @@
 ' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 %endif
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aliases.conf
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aliases.conf
 
 %if %{with imode}
 # add desktop file and icon
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 %endif
 
 # sources we don't package
@@ -387,6 +392,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315.2.10  2008/08/14 16:23:28  glen
+- catch up with HEAD
+
 Revision 1.315.2.9  2008/06/10 10:50:59  glen
 - bug #158 fix
 
================================================================

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