rpms/tuxcmd/devel tuxcmd-modules-0.6.36-disable-zip.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tuxcmd.spec, 1.1, 1.2

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11538

Modified Files:
	.cvsignore sources tuxcmd.spec 
Added Files:
	tuxcmd-modules-0.6.36-disable-zip.patch 
Log Message:
* Fri Jun  6 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-2
- Add modules (gnome-vfs2, libarchive)


tuxcmd-modules-0.6.36-disable-zip.patch:

--- NEW FILE tuxcmd-modules-0.6.36-disable-zip.patch ---
diff -up tuxcmd-modules-0.6.36/Makefile.bak tuxcmd-modules-0.6.36/Makefile
--- tuxcmd-modules-0.6.36/Makefile.bak	2008-06-06 17:00:55.000000000 +0200
+++ tuxcmd-modules-0.6.36/Makefile	2008-06-06 17:01:16.926731127 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = gnome_vfs zip libarchive
+SUBDIRS = gnome_vfs libarchive
 
 all install clean shared static::
 	target=`echo $@ | sed s/-recursive//`; \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jun 2008 08:12:40 -0000	1.2
+++ .cvsignore	6 Jun 2008 16:15:11 -0000	1.3
@@ -1 +1 @@
-tuxcmd-0.6.36.tar.bz2
+tuxcmd-modules-0.6.36.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jun 2008 08:12:40 -0000	1.2
+++ sources	6 Jun 2008 16:15:11 -0000	1.3
@@ -1 +1 @@
-228c61d170fc1701637e12f0873aa31f  tuxcmd-0.6.36.tar.bz2
+5912ed2726c04c01f318918178d01fb8  tuxcmd-modules-0.6.36.tar.bz2


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tuxcmd.spec	3 Jun 2008 08:09:31 -0000	1.1
+++ tuxcmd.spec	6 Jun 2008 16:15:11 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.36
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -11,14 +11,18 @@
 
 URL:            http://tuxcmd.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:        %{name}.desktop
-Source2:        tuxcmd.png
+Source1:        http://downloads.sourceforge.net/%{name}/%{name}-modules-%{version}.tar.bz2
+Source2:        %{name}.desktop
+Source3:        tuxcmd.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: fpc
 BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 
+Patch1: tuxcmd-modules-0.6.36-disable-zip.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
@@ -26,24 +30,63 @@
 VFS (virtual file system) modules.
 
 
+%package modules
+Summary:        Modules for Tux Commander file manager
+Group:          Applications/File
+Requires: %{name} = %{version}-%{release}
+Requires: bzip2-libs
+BuildRequires: libarchive-devel
+
+%description modules
+The tuxcmd-modules package contains extra VFS (virtual file system) modules
+extending Tux Commander's functionality:
+ * libarchive plugin - handles TAR/GZ/BZ2 archives
+
+
+
+%package gnomevfs2
+Summary:        GnomeVFS2 module for Tux Commander file manager
+Group:          Applications/File
+Requires: %{name} = %{version}-%{release}
+BuildRequires: gnome-vfs2-devel
+
+%description gnomevfs2
+This package contains GnomeVFS2 module for Tux Commander file manager.
+
+
+
+
 %prep
-%setup -q
+%setup -b 1 -q
+cd ../%{name}-modules-%{version}
+%patch1 -p1 -b .disable-zip
 
 
 %build
 make debug
 
+# build modules
+cd ../%{name}-modules-%{version}
+make shared
+
 
 %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 %{SOURCE1}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+desktop-file-install --vendor="" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
 
 find $RPM_BUILD_ROOT -name COPYING -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name README -exec rm -f {} ';'
 
+# install modules
+cd ../%{name}-modules-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT/usr
+mkdir -p doc/libarchive
+cp -pr libarchive/{COPYING,README} doc/libarchive
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,7 +100,21 @@
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/tuxcmd.png
 
+%files modules
+%defattr(-,root,root,-)
+%doc ../%{name}-modules-%{version}/doc/libarchive
+%{_libdir}/tuxcmd/libarchive_plugin.so
+
+%files gnomevfs2
+%defattr(-,root,root,-)
+%doc ../%{name}-modules-%{version}/gnome_vfs/README
+%doc ../%{name}-modules-%{version}/gnome_vfs/COPYING
+%{_libdir}/tuxcmd/libgnome_vfs.so
+
 
 %changelog
+* Fri Jun  6 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-2
+- Add modules (gnome-vfs2, libarchive)
+
 * Mon Jun  2 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-1
 - Initial packaging