openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package gftp (Revision 10d2527df880f1b513fbceccab621cff)

Currently displaying revision 10d2527df880f1b513fbceccab621cff , Show latest

--- gftp.changes.orig
+++ gftp.changes
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Sun Dec 27 12:22:27 CET 2009 - vuntz@opensuse.org
+
+- Reorganize spec file.
+- Use makeinstall macro.
+- Remove unneeded docbook-toys, indent, jadetex, texlive,
+  texlive-latex, texlive-latex-doc BuildRequires.
+- Split package in gftp, gftp-text and gftp-common subpackages,
+  with appropriate Supplements/Enhances.
+- Do not generate gftp-faq files: the README files have the same
+  content.
+
+-------------------------------------------------------------------
 Tue Aug  4 14:57:47 CEST 2009 - dominique-obs@leuenberger.net
 
 - Update to version 2.0.19:
--- gftp.spec.orig
+++ gftp.spec
@@ -15,36 +15,54 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           gftp
-BuildRequires:  docbook-toys fdupes gtk2-devel indent jadetex openssl-devel readline-devel texlive texlive-latex texlive-latex-doc translation-update-upstream update-desktop-files
-License:        GPL v2 or later
-Group:          Productivity/Networking/Ftp/Clients
 Version:        2.0.19
 Release:        1
-Source0:        %{name}-%{version}.tar.bz2
+License:        GPL v2 or later
+Summary:        Multithreaded File Transfer Client
 Url:            http://www.gftp.org/
+Group:          Productivity/Networking/Ftp/Clients
+Source0:        %{name}-%{version}.tar.bz2
+BuildRequires:  fdupes
+BuildRequires:  gtk2-devel
+BuildRequires:  openssl-devel
+BuildRequires:  readline-devel
+BuildRequires:  translation-update-upstream
+BuildRequires:  update-desktop-files
+Requires:       %{name}-common = %{version}
+Supplements:    packageand(%{name}-common:gtk2)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        Multithreaded FTP Client for X11
-Requires:       %{name}-lang = %{version}
 
 %description
-GFTP is a multithreaded FTP client for X11 written using Gtk. It has
-the following features: simultaneous downloads, resume of interrupted
-file transfers, file transfer queues, download of entire directories,
-ftp proxy support, remote directory caching, passive and nonpassive
-file transfers, drag and drop support, a very nice connection manager,
-and others.
+GFTP is a free multithreaded file transfer client for *NIX based
+machines, with advanced features.
 
+%package common
+License:        GPL v2 or later
+Summary:        Multithreaded File Transfer Client - Common Files
+Group:          Productivity/Networking/Ftp/Clients
+Requires:       %{name}-lang = %{version}
+
+%description common
+GFTP is a free multithreaded file transfer client for *NIX based
+machines, with advanced features.
+
+%package text
+License:        GPL v2 or later
+Summary:        Multithreaded File Transfer Client - Text UI
+Group:          Productivity/Networking/Ftp/Clients
+Requires:       %{name}-common = %{version}
+Enhances:       %{name}-common
 
+%description text
+GFTP is a free multithreaded file transfer client for *NIX based
+machines, with advanced features.
 
-Authors:
---------
-    Brian Masney <masneyb@newwave.net>
+This package contains a text user interface, that can be used
+without a graphical environment.
 
-%lang_package 
+%lang_package -n gftp-common
 %prep
 %setup
 translation-update-upstream
@@ -53,33 +71,42 @@ translation-update-upstream
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure
 make %{?jobs:-j%jobs}
-cd docs
-db2html gftp-faq.sgml
-db2pdf gftp-faq.sgml
-chmod og+rx gftp-faq
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-# Make gftp find its license:
-#rm $RPM_BUILD_ROOT%{_datadir}/gftp/COPYING
-%suse_update_desktop_file -N "Gnome FTP" -G "File Transfer" -r %{name} Network FileTransfer
+%makeinstall
+%suse_update_desktop_file -N gFTP -G "File Transfer" -r %{name} Network FileTransfer
 # rename sr@Latin to sr@latin
 mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin
+# Drop version of COPYING installed by package
+rm %{buildroot}%{_datadir}/gftp/COPYING
 %find_lang %{name}
-%fdupes -s $RPM_BUILD_ROOT
+%fdupes -s %{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
-%doc ChangeLog COPYING README README.html THANKS TODO docs/USERS-GUIDE docs/gftp-faq.pdf docs/gftp-faq
+%{_bindir}/gftp-gtk
 %{_datadir}/applications/gftp.desktop
-%{_datadir}/gftp
+%{_datadir}/gftp/*.png
+%{_datadir}/gftp/*.svg
+%{_datadir}/gftp/*.xpm
 %{_datadir}/pixmaps/*.png
-%{_bindir}/*
+
+%files common
+%defattr(-, root, root)
+%doc ChangeLog COPYING README README.html THANKS TODO docs/USERS-GUIDE
+%{_bindir}/gftp
+%dir %{_datadir}/gftp
+%{_datadir}/gftp/bookmarks
+%{_datadir}/gftp/gftprc
 %doc %{_mandir}/man?/*.*
 
-%files lang -f %{name}.lang
+%files text
+%defattr(-, root, root)
+%{_bindir}/gftp-text
+
+%files common-lang -f %{name}.lang
 
 %changelog

Places

File project.diff of Package gftp (Revision 10d2527df880f1b513fbceccab621cff)

Places