SPECS (AC-branch): poldek.spec - added -reversed-prompt.patch (fix...

[glen]

Author: glen                         Date: Wed Feb 20 21:00:26 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- added -reversed-prompt.patch (fixes #92)
- invoke fix-info-dir via /sbin/postshell where possible to avoid extra /bin/sh dep
- added desktop file and icon
- icon by Karol Kreński (mimooh) <mimooh at inf.sgsp.edu.pl> adapted as icon by arvenil;
  source: http://www.inf.sgsp.edu.pl/pub/MALUNKI_DUZE/ROZNE_DUZE/poldek.xcf.gz
- rel 14

---- Files affected:
SPECS:
   poldek.spec (1.277.2.3.2.18.2.4 -> 1.277.2.3.2.18.2.5) 

---- Diffs:

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.277.2.3.2.18.2.4 SPECS/poldek.spec:1.277.2.3.2.18.2.5
--- SPECS/poldek.spec:1.277.2.3.2.18.2.4	Fri Feb 15 04:26:43 2008
+++ SPECS/poldek.spec	Wed Feb 20 22:00:21 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		13
+%define	rel		14
 Summary:	RPM packages management helper tool
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:		poldek
@@ -21,6 +21,9 @@
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
 Source3:	%{name}-aliases.conf
+Source4:	%{name}.desktop
+Source5:	%{name}.png
+Patch0:		%{name}-dirdeps.patch
 Patch1:		%{name}-vserver-packages.patch
 Patch2:		%{name}-config.patch
 Patch3:		%{name}-multilib.patch
@@ -30,7 +33,7 @@
 Patch7:		%{name}-nohold-fix.patch
 Patch8:		%{name}-dir-dot.patch
 Patch9:		%{name}-suggests-one-package.patch
-Patch10:	%{name}-dirdeps.patch
+Patch10:	%{name}-reversed-prompt.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -156,6 +159,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?snap:-cvs%{snap}}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %ifarch %{x8664}
@@ -236,6 +240,13 @@
 
 install %{SOURCE3} $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
+%endif
+
 # get rid of non-pld sources
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,fedora}-source.conf
 # include them in %doc
@@ -253,11 +264,11 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun	-p	/sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
@@ -317,6 +328,10 @@
 %{_mandir}/man1/%{name}*
 %lang(pl) %{_mandir}/pl/man1/%{name}*
 %{_infodir}/poldek.info*
+%if %{with imode}
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
+%endif
 
 %if !%{with static}
 %files libs
@@ -348,6 +363,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.277.2.3.2.18.2.5  2008-02-20 21:00:21  glen
+- added -reversed-prompt.patch (fixes #92)
+- invoke fix-info-dir via /sbin/postshell where possible to avoid extra /bin/sh dep
+- added desktop file and icon
+- icon by Karol Kreński (mimooh) <mimooh at inf.sgsp.edu.pl> adapted as icon by arvenil;
+  source: http://www.inf.sgsp.edu.pl/pub/MALUNKI_DUZE/ROZNE_DUZE/poldek.xcf.gz
+- rel 14
+
 Revision 1.277.2.3.2.18.2.4  2008-02-15 03:26:43  glen
 - default dirdeps off, for cases where .rpmnew was not merged
 
================================================================

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