packages: fslint/fslint.desktop, fslint/fslint.spec - gui subpackage: fixed...

[gotar]

Author: gotar                        Date: Mon Jun 22 19:17:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gui subpackage: fixed liblocation, R: fslint,
- link icon to %_pixmapsdir
- rel. 2

---- Files affected:
packages/fslint:
   fslint.desktop (1.4 -> 1.5) , fslint.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/fslint/fslint.desktop
diff -u packages/fslint/fslint.desktop:1.4 packages/fslint/fslint.desktop:1.5
--- packages/fslint/fslint.desktop:1.4	Thu Dec 25 08:39:20 2008
+++ packages/fslint/fslint.desktop	Mon Jun 22 21:17:45 2009
@@ -3,7 +3,7 @@
 Comment=Clean up your filesystems
 Comment[pl]=Sprzątanie systemów plików
 Exec=fslint
-Icon=/usr/share/fslint/fslint_icon.png
+Icon=fslint_icon.png
 Terminal=false
 Type=Application
 Encoding=UTF-8

================================================================
Index: packages/fslint/fslint.spec
diff -u packages/fslint/fslint.spec:1.2 packages/fslint/fslint.spec:1.3
--- packages/fslint/fslint.spec:1.2	Mon Jun 22 20:28:21 2009
+++ packages/fslint/fslint.spec	Mon Jun 22 21:17:45 2009
@@ -2,7 +2,7 @@
 Summary:	Utility to find and clean "lint" on a filesystem
 Name:		fslint
 Version:	2.28
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/File
 Source0:	http://www.pixelbeat.org/fslint/%{name}-%{version}.tar.gz
@@ -42,6 +42,7 @@
 %package gui
 Summary:	fslint GUI
 Group:		X11/Applications
+Requires:	fslint
 Requires:	python >= 2.0
 Requires:	python-pygtk-glade
 
@@ -66,6 +67,9 @@
 	s,"$script_dir",%{_datadir}/fslint,
 ' fslint/{find??,fslint,zipdir}
 
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' fslint-gui
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' fslint-gui
+
 %build
 %{__make} -C po
 
@@ -74,14 +78,15 @@
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir},%{_mandir}/man1,%{_datadir}/fslint}
 install fslint-gui $RPM_BUILD_ROOT%{_bindir}/fslint-gui
 
-cp -a fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/fslint/fslint_icon.png
-cp -a fslint.glade $RPM_BUILD_ROOT%{_datadir}/fslint
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install fslint.glade $RPM_BUILD_ROOT%{_datadir}/fslint
+install fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/fslint
+ln -s %{_datadir}/fslint/fslint_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 cp -a fslint/{find??,fslint,zipdir} $RPM_BUILD_ROOT%{_bindir}
 cp -a fslint/{fstool,supprt} $RPM_BUILD_ROOT%{_datadir}/fslint
 
-cp -a man/fslint-gui.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install man/fslint-gui.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %{__make} -C po install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -136,6 +141,7 @@
 %{_desktopdir}/fslint.desktop
 %{_datadir}/fslint/fslint.glade
 %{_datadir}/fslint/fslint_icon.png
+%{_pixmapsdir}/fslint_icon.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -143,6 +149,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/06/22 19:17:45  gotar
+- gui subpackage: fixed liblocation, R: fslint,
+- link icon to %_pixmapsdir
+- rel. 2
+
 Revision 1.2  2009/06/22 18:28:21  gotar
 - fixed Group, cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fslint/fslint.desktop?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fslint/fslint.spec?r1=1.2&r2=1.3&f=u