rpms/tuxcmd/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tuxcmd.spec, 1.16, 1.17

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25343

Modified Files:
	.cvsignore sources tuxcmd.spec 
Log Message:
* Thu Nov 19 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.70-1
- Update to v0.6.70



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	9 Apr 2009 10:22:40 -0000	1.6
+++ .cvsignore	19 Nov 2009 09:43:50 -0000	1.7
@@ -1,2 +1,2 @@
-tuxcmd-0.6.62.git20090409.tar.bz2
-tuxcmd-modules-0.6.62.git20090409.tar.bz2
+tuxcmd-0.6.70.tar.bz2
+tuxcmd-modules-0.6.70.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	9 Apr 2009 10:22:40 -0000	1.6
+++ sources	19 Nov 2009 09:43:50 -0000	1.7
@@ -1,2 +1,2 @@
-e5a675fb29e4df6d73ff8a4ad26d94bf  tuxcmd-0.6.62.git20090409.tar.bz2
-ddaff924b6a3e340e066a6b670ff922f  tuxcmd-modules-0.6.62.git20090409.tar.bz2
+52e3bfa7c4118539b4c4b83e335290d1  tuxcmd-0.6.70.tar.bz2
+e3e2471f6f245d3191e9a845c73518ff  tuxcmd-modules-0.6.70.tar.bz2


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- tuxcmd.spec	27 Jul 2009 06:22:37 -0000	1.16
+++ tuxcmd.spec	19 Nov 2009 09:43:50 -0000	1.17
@@ -1,33 +1,26 @@
 Name:           tuxcmd
-Version:        0.6.62
-Release:        git20090409.2%{?dist}.1
+Version:        0.6.70
+Release:        1%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
 License:        GPLv2+
 
 # FreePascal restrictions
-ExclusiveArch:  %{ix86} x86_64  
+ExcludeArch:    s390 s390x
 
 URL:            http://tuxcmd.sourceforge.net/
-# Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-# Source1:        http://downloads.sourceforge.net/%{name}/%{name}-modules-%{version}.tar.bz2
-Source0:        %{name}-%{version}.git20090409.tar.bz2
-Source1:        %{name}-modules-%{version}.git20090409.tar.bz2
-Source2:        %{name}.desktop
-Source3:        tuxcmd.png
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1:        http://downloads.sourceforge.net/%{name}/%{name}-modules-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: fpc >= 2.2.2-2
+BuildRequires: fpc >= 2.2.4-4%{?dist}
 BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
-# enable searching for modules in lib64 dirs
-Patch5: tuxcmd-0.6.62-lib64.patch
-
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -66,11 +59,10 @@ This package contains networking GVFS mo
 %setup -q -b 1
 
 %patch4 -p1 -b .disable-smartlinking
-%patch5 -p1 -b .lib64
 
 %build
 
-make debug
+make final_debug
 
 # build modules
 cd ../%{name}-modules-%{version}
@@ -80,9 +72,9 @@ make CC="gcc %{optflags}" CPP="g++ %{opt
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT/usr
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-desktop-file-install --vendor="" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
-cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+desktop-file-install --delete-original  \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+    $RPM_BUILD_ROOT%{_datadir}/applications/tuxcmd.desktop
 
 find $RPM_BUILD_ROOT -name COPYING -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name README -exec rm -f {} ';'
@@ -101,6 +93,20 @@ cp -pr zip/{COPYING,README} doc/zip
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+update-desktop-database %{_datadir}/applications &> /dev/null
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
+%postun
+update-desktop-database %{_datadir}/applications &> /dev/null
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+fi
+
 
 %files
 %defattr(-,root,root,-)
@@ -108,7 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/tuxcmd
 %{_bindir}/tuxcmd
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/tuxcmd.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+
 
 %files modules
 %defattr(-,root,root,-)
@@ -125,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 19 2009 Tomas Bzatek <tbzatek at redhat.com> 0.6.70-1
+- Update to v0.6.70
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.62-git20090409.2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild