rpms/fslint/FC-3 .cvsignore, 1.2, 1.3 fslint.spec, 1.4, 1.5 sources, 1.2, 1.3 fslint-desktop.patch, 1.1, NONE

Tue Mar 29 19:19:12 UTC 2005

Author: scop

Update of /cvs/extras/rpms/fslint/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19406/FC-3

Modified Files:
	.cvsignore fslint.spec sources 
Removed Files:
	fslint-desktop.patch 
Log Message:
auto-import fslint-2.11-1 on branch FC-3 from fslint-2.11-1.src.rpm
http://bugzilla.fedora.us/show_bug.cgi?id=1572


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	8 Nov 2004 04:20:32 -0000	1.2
+++ .cvsignore	29 Mar 2005 19:19:10 -0000	1.3
@@ -1 +1 @@
-FSlint-2.02.tar.gz
+FSlint-2.11.tar.gz


Index: fslint.spec
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/fslint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fslint.spec	10 Dec 2004 22:03:02 -0000	1.4
+++ fslint.spec	29 Mar 2005 19:19:10 -0000	1.5
@@ -1,35 +1,30 @@
-%define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pysitedir %{_libdir}/python%{pyver}/site-packages
-
 Name:           fslint
-Version:        2.02
-Release:        2
+Version:        2.11
+Release:        1
 Epoch:          0
 Summary:        FSlint - a utility to find and clean "lint" on a filesystem
 
 Group:          Applications/File
 License:        GPL
 URL:            http://www.pixelbeat.org/fslint/
-Source0:        http://www.pixelbeat.org/fslint/FSlint-2.02.tar.gz
-Patch0:         %{name}-desktop.patch
+Source0:        http://www.pixelbeat.org/fslint/FSlint-2.11.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
 
+BuildArch:      noarch
 BuildRequires:  gettext, desktop-file-utils
-Requires:       python >= 0:%{pyver}, pygtk2, pygtk2-libglade, cpio
+Requires:       python >= 0:2.0, pygtk2, pygtk2-libglade, cpio
 
 %description
-FSlint is a toolkit to find all redundant disk usage.  It includes a
-GUI as well as a command line interface.
+FSlint is a toolkit to find all redundant disk usage (duplicate files
+for e.g.). It includes a GUI as well as a command line interface.
 
 
 %prep
 %setup -q -n FSlint-%{version}
-%patch0 -p0
+%{__perl} -pi -e 's|^liblocation=.*$|liblocation="%{_datadir}/%{name}" #RPM edit|' FSlint
+%{__perl} -pi -e 's|^locale_base=.*$|locale_base=None #RPM edit|' FSlint
 mv fslint/fstool/README README.fstool
 mv fslint/rmlint/README README.rmlint
-echo "liblocation = '%{_datadir}/%{name}'" > __init__.py
-perl -pi -e 's|^Icon=(.*)$|Icon=%{_datadir}/%{name}/$1|' fslint.desktop
 
 
 %build
@@ -38,29 +33,28 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -p -m 0755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/{fstool,rmlint}
-install -p -m 0644 fslint.glade fslint_icon.png \
+install -Dpm 755 FSlint $RPM_BUILD_ROOT%{_bindir}/FSlint
+ln -s FSlint $RPM_BUILD_ROOT%{_bindir}/fslint
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}/{fstool,rmlint}
+install -pm 644 fslint.glade fslint_icon.png \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -p -m 0755 fslint/{find*,fsl*,get*,zipdir} \
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s %{_datadir}/%{name}/fslint_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -pm 755 fslint/{find*,fsl*,get*,zipdir} \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint
-install -p -m 0755 fslint/fstool/* \
+install -pm 755 fslint/fstool/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/fstool
-install -p -m 0755 fslint/rmlint/* \
+install -pm 755 fslint/rmlint/* \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/fslint/rmlint
 
 make -C po DESTDIR=$RPM_BUILD_ROOT LOCALEDIR=%{_datadir}/locale install
 
-install -D -p -m 0644 __init__.py \
-  $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py
-touch $RPM_BUILD_ROOT%{pysitedir}/FSlint/__init__.py{c,o}
-
 desktop-file-install \
   --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --mode 0644 \
+  --mode 644 \
   --add-category X-Fedora \
-  fslint.desktop
+  %{name}.desktop
 
 %find_lang %{name}
 
@@ -72,15 +66,31 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc doc/* README.*
-%{_bindir}/*
-%dir %{pysitedir}/FSlint
-%{pysitedir}/FSlint/*.py
-%ghost %{pysitedir}/FSlint/*.py?
+%{_bindir}/*lint
 %{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/pixmaps/fslint_icon.png
 
 
 %changelog
+* Fri Mar 18 2005 PÃ¡draig Brady <P at draigBrady.com> - 0:2.11-1
+- Update to 2.11
+
+* Wed Mar 16 2005 PÃ¡draig Brady <P at draigBrady.com> - 0:2.10-0.fdr.2
+- Update to 2.10
+
+* Tue Sep  9 2004 PÃ¡draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.2
+- Fix locale support broken in previous version
+
+* Wed Sep  1 2004 PÃ¡draig Brady <P at draigBrady.com> - 0:2.08-0.fdr.1
+- Update to 2.08.
+- Remove redundant patch.
+
+* Wed May  5 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:2.06-0.fdr.1
+- Update to 2.06.
+- Add %%{_bindir}/fslint symlink.
+- Make installation Python version independent.
+
 * Thu Aug 28 2003 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:2.02-0.fdr.2
 - Requires: cpio, remove redundant findutils dependency (bug 539).
 - Fix version in dependency on python.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fslint/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:20:32 -0000	1.2
+++ sources	29 Mar 2005 19:19:10 -0000	1.3
@@ -1 +1 @@
-24d101f560d9018161ee10e1eb12ec37  FSlint-2.02.tar.gz
+518ef710828f6b55adf7fc665e9146f9  FSlint-2.11.tar.gz


--- fslint-desktop.patch DELETED ---


