[rodent] Update to a 5.2.3 ; git commit 5c2e81

Antonio Trande sagitter at fedoraproject.org
Sun Feb 9 16:28:32 UTC 2014


commit 21c4d1e38ea13157457df56224f31ee6850874eb
Author: sagitter <anto.trande at gmail.com>
Date:   Sun Feb 9 17:29:00 2014 +0100

    Update to a 5.2.3 ; git commit 5c2e81

 .gitignore  |    1 +
 rodent.spec |  208 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 sources     |    2 +-
 3 files changed, 171 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 910adbd..9e4821f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /rodent-5.2.0.tar.bz2
 /rodent-5.2.1.tar.bz2
+/xffm-rodent-d1d6a2ab7262a8536e5556de68692061bec3c8ff.zip
diff --git a/rodent.spec b/rodent.spec
index 0018286..7e00fb0 100644
--- a/rodent.spec
+++ b/rodent.spec
@@ -1,10 +1,17 @@
+%global   checkout d1d6a2ab7262a8536e5556de68692061bec3c8ff
+
+%global   with_rodentfgr     1
+%global   with_rodentdiff    1
+%global   with_rodenticonmgr 1
+%global   with_rodentfm      1
+
 Name:  rodent
 Summary: Advanced user file manager for Linux/BSD systems
-Version: 5.2.1
-Release: 1%{?dist}
+Version: 5.2.3
+Release: 1.20140207git%(echo %{checkout} | cut -c -6)%{?dist}
 License: GPLv3+
 URL: http://xffm.foo-projects.org/
-Source0: http://sourceforge.net/projects/xffm/files/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://sourceforge.net/code-snapshots/git/x/xf/xffm/rodent.git/xffm-rodent-d1d6a2ab7262a8536e5556de68692061bec3c8ff.zip
 
 BuildRequires: gtk2-devel
 BuildRequires: libxml2-devel
@@ -16,44 +23,74 @@ BuildRequires: librsvg2-devel
 BuildRequires: libzip-devel
 BuildRequires: dbh-devel >= 5.0.13
 BuildRequires: tubo-devel >= 5.0.12
-BuildRequires: librfm-devel >= 5.2.0
+BuildRequires: librfm-devel >= 5.2.3
 BuildRequires: desktop-file-utils, chrpath, procps-ng
 
+##Needed by autogen.sh
+BuildRequires:  libtool, autoconf, automake
+
 %description
 Rodent is fast, small and powerful parallel file manager. All operations are
 done in threads, and command are inherited from the GNU or BSD operating
 systems to reduce the possibility of bugs to a minimum.
 
-%prep
-%setup -q
+%if 0%{?with_rodentfgr}
+%package -n  rodent-fgr
+Summary:     Search tool for Rodent
+Requires:    %{name}%{?_isa} = %{version}-%{release}
+
+%description -n rodent-fgr
+Search tool for Rodent. Uses fgr and grep.
+Rodent is fast, small and powerful parallel file manager. All operations are
+done in threads, and command are inherited from the GNU or BSD operating
+systems to reduce the possibility of bugs to a minimum.
+%endif #%%if with_rodentfgr
+
+%if 0%{?with_rodentdiff}
+%package -n  rodent-diff
+Summary:     Differences tool for Rodent
+Requires:    %{name}%{?_isa} = %{version}-%{release}
+
+%description -n rodent-diff
+Differences tool for Rodent. Uses system diff application (GNU or BSD).
+Rodent is fast, small and powerful parallel file manager. All operations are
+done in threads, and command are inherited from the GNU or BSD operating
+systems to reduce the possibility of bugs to a minimum.
+%endif #%%if with_rodentdiff
 
-## These commands change the 'Rodent' category in all .desktop files
-sed -e 's|Rodent;|X-Rodent;|g' -i Build/bin/*.desktop.in.in
-sed -e 's|Rodent;|X-Rodent;|g' -i Build/plugins/*.desktop.in.in
+%if 0%{?with_rodenticonmgr}
+%package -n  rodent-iconmgr
+Summary:     Icon customization dialog for Rodent applications
+Requires:    %{name}%{?_isa} = %{version}-%{release}
+
+%description -n rodent-iconmgr
+Icon customization dialog for Rodent applications.
+Rodent is fast, small and powerful parallel file manager. All operations are
+done in threads, and command are inherited from the GNU or BSD operating
+systems to reduce the possibility of bugs to a minimum.
+%endif #%%if with_rodenticonmgr
+
+%prep
+%setup -q -n xffm-%{name}-%{checkout}
 
 %build
-%configure --enable-static=no --enable-shared=yes --enable-libzip --with-gtk2 \
-           --disable-silent-rules --enable-ftp --enable-bluetooth
+./autogen.sh
+%configure --enable-static=no --enable-shared=yes \
+ --disable-silent-rules --enable-ftp --enable-bluetooth
+make %{?_smp_mflags} CFLAGS="%{optflags}" 
 
-## Fix 'unused-direct-shlib-dependency' warnings
-sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
+%find_lang rodent-fgr --with-gnome
+%find_lang rodent-diff --with-gnome
+%find_lang rodent-iconmgr --with-gnome
+%find_lang rodent-fm --with-gnome
+%find_lang fgr --with-gnome
 
 ## Remove libtool archives
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
-## Remove rpaths
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}-*
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/fgr
-
-## This directory is useless for the packaging
-rm -rf $RPM_BUILD_ROOT%{_docdir}/@RC_DIR@
-
 ## Remove pkg-config file.
 ## It's used just by who are building and installing from source
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
@@ -79,22 +116,115 @@ fi
 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
-%files -f %{name}.lang
-%doc README ChangeLog COPYING AUTHORS docs/RTFM/RTFM.pdf
-%{_bindir}/%{name}
-%{_bindir}/%{name}-*
+%files -f rodent-fm.lang -f fgr.lang
+%doc apps/README ChangeLog COPYING AUTHORS apps/rodent-fm/docs/RTFM/RTFM.pdf
+%{_bindir}/rodent
+%{_bindir}/rodent-root
+%{_bindir}/rodent-anim
 %{_bindir}/fgr
-%{_libdir}/rfm/
-%{_datadir}/icons/rfm/
+%{_bindir}/rodent-plug
+%{_bindir}/rodent-desk
+%{_bindir}/rodent-fm
+%{_bindir}/rodent-getpass
+%dir %{_libdir}/rfm/plugins
+%{_libdir}/rfm/plugins/libfstab.so
+%{_libdir}/rfm/plugins/libecryptfs.so
+%{_libdir}/rfm/plugins/libobex.so
+%{_libdir}/rfm/plugins/libfuse.so
+%{_libdir}/rfm/plugins/libdotdesktop.so
+%{_libdir}/rfm/plugins/libps.so
+%{_libdir}/rfm/plugins/libftp.so
+%{_libdir}/rfm/plugins/libnfs.so
+%{_libdir}/rfm/plugins/libsftp.so
+%{_libdir}/rfm/plugins/libshares.so
+%{_libdir}/rfm/plugins/libsmb.so
+%{_libdir}/rfm/plugins/libcifs.so
+%{_libdir}/rfm/plugins/libworkgroup.so
+%dir %{_libdir}/rfm/modules
+%{_libdir}/rfm/modules/libgridview.so
+%{_libdir}/rfm/modules/libdeskview.so
+%{_datadir}/icons/rfm/48x48/
+%{_datadir}/icons/rfm/animated/
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
-%{_datadir}/rfm/
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.svg
-%{_mandir}/man1/%{name}.*
-%{_mandir}/man1/%{name}-*
-%{_mandir}/man1/fgr.*
+%{_datadir}/applications/Rodent.desktop 
+%{_datadir}/applications/Rodent-root.desktop
+%{_datadir}/applications/Rodent-dotdesktop.desktop
+%{_datadir}/applications/Rodent-fstab.desktop
+%{_datadir}/applications/Rodent-ps.desktop
+%{_datadir}/pixmaps/rodent.svg
+%{_datadir}/pixmaps/rodent-diff.svg
+%{_datadir}/pixmaps/rodent-fgr.svg
+%{_datadir}/pixmaps/rodent-cifs.svg
+%{_datadir}/pixmaps/rodent-dotdesktop.svg
+%{_datadir}/pixmaps/rodent-ecryptfs.svg
+%{_datadir}/pixmaps/rodent-fstab.svg
+%{_datadir}/pixmaps/rodent-ftp.svg
+%{_datadir}/pixmaps/rodent-nfs.svg
+%{_datadir}/pixmaps/rodent-obex.svg
+%{_datadir}/pixmaps/rodent-ps.svg
+%{_datadir}/pixmaps/rodent-shares.svg
+%{_datadir}/pixmaps/rodent-smb.svg
+%{_datadir}/pixmaps/rodent-sshfs.svg
+%{_datadir}/pixmaps/rodent-workgroup.svg
+%{_datadir}/pixmaps/rodent-fuse.svg
+%{_mandir}/man1/%{name}.1* 
+%{_mandir}/man1/fgr.1* 
+%{_mandir}/man1/%{name}-anim.1* 
+%{_mandir}/man1/%{name}-forked.1* 
+%{_mandir}/man1/%{name}-desk.1* 
+%{_mandir}/man1/%{name}-getpass.1* 
+%{_mandir}/man1/%{name}-fstab.1*
+%{_mandir}/man1/%{name}-ps.1* 
+%{_mandir}/man1/%{name}-dotdesktop.1* 
+%{_mandir}/man1/%{name}-fuse.1* 
+%{_mandir}/man1/%{name}-sshfs.1* 
+%{_mandir}/man1/%{name}-ecryptfs.1* 
+%{_mandir}/man1/%{name}-obex.1* 
+%{_mandir}/man1/%{name}-nfs.1* 
+%{_mandir}/man1/%{name}-cifs.1* 
+%{_mandir}/man1/%{name}-ftp.1* 
+%{_mandir}/man1/%{name}-smb.1* 
+%{_mandir}/man1/%{name}-workgroup.1* 
+%{_mandir}/man1/%{name}-shares.1*
+%{_mandir}/man1/%{name}-root.1*
+
+%if 0%{?with_rodentfgr}
+%files -n rodent-fgr -f rodent-fgr.lang
+%{_bindir}/%{name}-fgr
+%{_datadir}/icons/rfm/48x48/apps/%{name}-fgr.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-fgr.svg
+%{_datadir}/applications/Rodent-fgr.desktop
+%{_datadir}/pixmaps/%{name}-fgr.svg
+%{_mandir}/man1/%{name}-fgr.1*
+%endif #%if with_rodentfgr
+
+%if 0%{?with_rodentdiff}
+%files -n rodent-diff -f rodent-diff.lang
+%{_bindir}/%{name}-diff
+%{_datadir}/icons/rfm/48x48/apps/%{name}-diff.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-diff.svg
+%{_datadir}/applications/Rodent-diff.desktop
+%{_datadir}/pixmaps/%{name}-diff.svg
+%{_mandir}/man1/%{name}-diff.1*
+%endif #%if with_rodentdiff
+
+%if 0%{?with_rodenticonmgr}
+%files -n rodent-iconmgr -f rodent-iconmgr.lang
+%{_bindir}/%{name}-iconmgr
+%{_datadir}/icons/rfm/48x48/apps/%{name}-iconmgr.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}-iconmgr.svg
+%{_datadir}/applications/Rodent-iconmgr.desktop
+%{_datadir}/pixmaps/%{name}-iconmgr.svg
+%{_mandir}/man1/%{name}-iconmgr.1*
+%endif #%if with_rodenticonmgr
 
 %changelog
+* Sun Feb 09 2014 Antonio Trande <sagitterATfedoraproject.org> 5.2.3-1.20140207gitd1d6a2
+- Update to a 5.2.3 post-release (d1d6a2) from git
+- librfm minimum version request changed to 5.2.3
+- Rodent apps splitted in own sub-packages
+- Perform autogen.sh to create system specific build files
+
 * Sat Jan 11 2014 Antonio Trande <sagitterATfedoraproject.org> 5.2.1-1
 - Update to 5.2.1
 - Removed ldconfig calls
@@ -104,7 +234,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 * Tue Jan 07 2014 Antonio Trande <sagitterATfedoraproject.org> 5.2.0-2
 - DBH minimum release changed 
 
-* Sun Dec 29 2013 Antonio Trande <sagitter at fedoraproject.org> 5.2.0-1
+* Sun Dec 29 2013 Antonio Trande <sagitterATfedoraproject.org> 5.2.0-1
 - Update to 5.2.0
 - URL tag changed
 - %%check section added
@@ -112,15 +242,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 - Defined CFLAGS in %%build
 - Devel subpackage building
 
-* Sun Oct 13 2013 Antonio Trande <sagitter at fedoraproject.org> 5.1.3-2
+* Sun Oct 13 2013 Antonio Trande <sagitterATfedoraproject.org> 5.1.3-2
 - Requires dependencies removed
 - BuildRequires minimum versions removed
 
-* Sat Oct 12 2013 Antonio Trande <sagitter at fedoraproject.org> 5.1.3-1
+* Sat Oct 12 2013 Antonio Trande <sagitterATfedoraproject.org> 5.1.3-1
 - Update to 5.1.3 - In this release all primary libraries (librfm) 
   are split off into their own package
 - Added 'librfm-devel >= 5.1.0' BR
 - Patch exchanged with 'sed' commands in %%build section  
 
-* Mon Oct 07 2013 Antonio Trande <sagitter at fedoraproject.org> 5.1.2-1
+* Mon Oct 07 2013 Antonio Trande <sagitterATfedoraproject.org> 5.1.2-1
 - First package
diff --git a/sources b/sources
index ff9c1c8..71bf304 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-796430e94707a705cffa6de996bb8837  rodent-5.2.1.tar.bz2
+73a60763bbaa7e6dcec33f9e1c9550dd  xffm-rodent-d1d6a2ab7262a8536e5556de68692061bec3c8ff.zip


More information about the scm-commits mailing list