packages (AC-DEVEL): poldek/poldek.spec - merge rc5 from HEAD

glen glen at pld-linux.org
Thu Mar 22 21:40:50 CET 2012


Author: glen                         Date: Thu Mar 22 20:40:50 2012 GMT
Module: packages                      Tag: AC-DEVEL
---- Log message:
- merge rc5 from HEAD

---- Files affected:
packages/poldek:
   poldek.spec (1.315.2.28 -> 1.315.2.29) 

---- Diffs:

================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.315.2.28 packages/poldek/poldek.spec:1.315.2.29
--- packages/poldek/poldek.spec:1.315.2.28	Thu Jan 12 00:44:05 2012
+++ packages/poldek/poldek.spec	Thu Mar 22 21:40:45 2012
@@ -11,8 +11,8 @@
 %define	ver_db	4.5.20
 %define	ver_rpm	4.5-49
 
-%define		snap	rc3
-%define		rel	2
+%define		snap	rc5
+%define		rel	4
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -22,8 +22,8 @@
 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/~cactus/snaps/poldek/%{name}-%{version}%{snap}.tar.bz2
-# Source0-md5:	d85c14544d02d03d67d0b1ebd6ec7c61
+Source0:	http://carme.pld-linux.org/~cactus/snaps/poldek/%{name}-%{version}%{snap}.tar.xz
+# Source0-md5:	ab89926c28cfb6b7d72497fc37c16ac4
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
 Source5:	%{name}-aliases.conf
@@ -33,7 +33,8 @@
 Patch0:		%{name}-vserver-packages.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-size-type.patch
-Patch4:		%{name}-Os-fail-workaround.patch
+Patch3:		%{name}-Os-fail-workaround.patch
+Patch4:		%{name}-git.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -194,6 +195,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 
 rm -f m4/libtool.m4 m4/lt*.m4
@@ -227,7 +229,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -269,13 +271,13 @@
 ' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 %endif
 
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
 
 %if %{with imode}
 # add desktop file and icon
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 %endif
 
 # sources we don't package
@@ -409,6 +411,7 @@
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
 %endif
+%dir /var/cache/%{name}
 
 %if %{without static}
 %files libs
@@ -449,6 +452,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315.2.29  2012/03/22 20:40:45  glen
+- merge rc5 from HEAD
+
 Revision 1.315.2.28  2012/01/11 23:44:05  glen
 - up to rc3
 
================================================================

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



More information about the pld-cvs-commit mailing list