From 35a52f4fe8f89f2b0398cf644b880bac9a70cb73 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Jan 14 2010 20:11:21 +0000 Subject: update to latest upstream release. Plan to test sub package split and fixes for often reported crashes via updates-testing repo --- diff --git a/qtr.desktop b/qtr.desktop new file mode 100644 index 0000000..f7a7592 --- /dev/null +++ b/qtr.desktop @@ -0,0 +1,11 @@ + +[Desktop Entry] +Name=Qtransmission Bittorrent Client +GenericName=BitTorrent Client +Comment=Download and share files over BitTorrent +Exec=qtr %F +Icon=transmission +Terminal=false +Type=Application +MimeType=application/x-bittorrent; +Categories=Network;FileTransfer;P2P;Qt; diff --git a/sources b/sources index fd1e42d..b977bc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75db338e01029b175b8bae9887424bd5 transmission-1.77.tar.xz +526b6818f842b25c49669501995b0ff8 transmission-1.80b5.tar.xz diff --git a/transmission.spec b/transmission.spec index 694231a..2280dd4 100644 --- a/transmission.spec +++ b/transmission.spec @@ -1,50 +1,99 @@ Name: transmission -Version: 1.77 -Release: 1%{?dist} +Version: 1.80 +Release: 0.5.b5%{?dist} Summary: A lightweight GTK+ BitTorrent client Group: Applications/Internet # See COPYING. This licensing situation is... special. License: MIT and GPLv2 URL: http://www.transmissionbt.com/ -Source0: http://download.m0k.org/transmission/files/transmission-%{version}.tar.xz - +Source0: http://download.m0k.org/transmission/files/transmission-%{version}b5.tar.xz +Source1: qtr.desktop BuildRequires: openssl-devel >= 0.9.4 BuildRequires: glib2-devel >= 2.15.5 BuildRequires: gtk2-devel >= 2.6.0 BuildRequires: libnotify-devel >= 0.4.3 -BuildRequires: curl-devel >= 7.16.3 +BuildRequires: libcanberra-devel +BuildRequires: libcurl-devel >= 7.16.3 BuildRequires: dbus-glib-devel >= 0.70 BuildRequires: libevent-devel >= 1.4.5 BuildRequires: desktop-file-utils BuildRequires: gettext intltool BuildRequires: GConf2-devel - +BuildRequires: qt-devel +# this modification applies to the Qt qtr.pro file +Patch1: use-system-libevent-fix-optflags-patch +Requires: transmission-cli +Requires: transmission-gtk %description Transmission is a free, lightweight BitTorrent client. It features a simple, intuitive interface on top on an efficient, cross-platform back-end. +%package common +Summary: Transmission common files +Conflicts: transmission < 1.80-0.3.b4 +%description common +This package contains the common files necessary for other +transmission subpackages. It includes the web user interface +icons and transmission-remote + +%package cli +Summary: Transmission command line implementation +Requires: transmission-common +Provides: transmission = %{version}-%{release} +%description cli +This package contains the files necessary to run the command line version of Transmission + +%package daemon +Summary: Transmission daemon +Requires: transmission-common +Provides: transmission = %{version}-%{release} +%description daemon +This package contains the files necessary to run Transmission daemon + +%package gtk +Summary: Transmission GTK interface +Requires: transmission-common +Obsoletes: transmission <= 1.80-0.3.b4 +Provides: transmission = %{version}-%{release} + +%description gtk +This package contains files needed for the GTK interface of Transmission. + +%package qt +Summary: Transmission Qt interface +Requires: transmission-common +%description qt +This package contains files needed for the Qt interface of Transmission. %prep -%setup -q +%setup -q -n transmission-1.80b5 +%patch1 -p1 %build -%configure --disable-static --with-gtk --without-wx +%configure --disable-static --with-gtk --without-wx --enable-libcanberra --enable-libnotify --enable-daemon make %{?_smp_mflags} +pushd qt +qmake-qt4 qtr.pro +make +popd + %install -make install DESTDIR=$RPM_BUILD_ROOT -%find_lang %{name} +make install DESTDIR=%{buildroot} -desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \ - $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop +make install INSTALL_ROOT=%{buildroot}%{_prefix} -C qt -%clean -rm -rf $RPM_BUILD_ROOT +%find_lang %{name} +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} + +%clean +rm -rf %{buildroot} %post touch --no-create %{_datadir}/icons/hicolor || : @@ -57,22 +106,65 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : update-desktop-database > /dev/null 2>&1 || : +%files -%files -f %{name}.lang +%files common %defattr(-, root, root, -) %doc AUTHORS COPYING NEWS README -%{_bindir}/transmission* -%{_datadir}/transmission +%{_bindir}/transmission-remote +%{_datadir}/transmission/web/ %{_datadir}/pixmaps/* %{_datadir}/icons/hicolor/*/apps/transmission.* -%{_datadir}/applications/*transmission.desktop -%doc %{_mandir}/man1/transmission* +%doc %{_mandir}/man1/transmission-remote* + +%files cli +%defattr(-, root, root, -) +%{_bindir}/transmissioncli +%doc %{_mandir}/man1/transmissioncli* + +%files daemon +%defattr(-, root, root, -) +%{_bindir}/transmission-daemon +%doc %{_mandir}/man1/transmission-daemon* + +%files gtk -f %{name}.lang +%defattr(-, root, root, -) +%{_bindir}/transmission +%{_datadir}/applications/transmission.desktop +%doc %{_mandir}/man1/transmission.* + +%files qt +%defattr(-, root, root, -) +%{_bindir}/qtr +%{_datadir}/applications/qtr.desktop %changelog -* Tue Jan 05 2010 Rahul Sundaram - 1.77-1 -- Fix potential data loss by maliciously-crafted .torrent files -- http://trac.transmissionbt.com/wiki/Changes#version-1.77 + +* Thu Jan 14 2010 Rahul Sundaram - 1.80-0.5.b5 +- Bug fixes +- http://trac.transmissionbt.com/wiki/Changes#version-1.80b5 + +* Sat Jan 09 2010 Rahul Sundaram - 1.80-0.4.b4 +- Build the qt interface as a sub package +- Build daemon as a separate sub package +- Translations are for only the gtk sub package +- Fix obsoletes and add conflicts + +* Thu Jan 07 2010 Ankur Sinha - 1.80-0.3.b4 +- Split package to sub packages + +* Tue Jan 05 2010 Rahul Sundaram - 1.80-0.2.b4 +- Add BR GConf2-devel + +* Tue Jan 05 2010 Rahul Sundaram - 1.80-0.1.b4 +- 1.80 Beta 4 +- http://trac.transmissionbt.com/wiki/Changes#version-1.80b4 + +* Thu Dec 17 2009 Rahul Sundaram - 1.80-0.1.b3 +- 1.80 Beta 3 +- Enable sounds via libcanberra +- http://trac.transmissionbt.com/wiki/Changes#version-1.80b3 * Sun Oct 25 2009 Rahul Sundaram - 1.76-1 - http://trac.transmissionbt.com/wiki/Changes#version-1.76 diff --git a/use-system-libevent-fix-optflags-patch b/use-system-libevent-fix-optflags-patch new file mode 100644 index 0000000..98e6a3c --- /dev/null +++ b/use-system-libevent-fix-optflags-patch @@ -0,0 +1,20 @@ +--- transmission-1.77/qt/qtr.pro.orig 2010-01-09 08:31:17.171939362 +0530 ++++ transmission-1.77/qt/qtr.pro 2010-01-09 08:34:53.792939532 +0530 +@@ -7,7 +7,7 @@ + target.path = /bin + INSTALLS += target + +-CONFIG += qt thread debug link_pkgconfig ++CONFIG += qt thread release link_pkgconfig + QT += network + PKGCONFIG = fontconfig libcurl openssl + +@@ -17,7 +17,7 @@ + LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a + LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a + LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a +-LIBS += $${TRANSMISSION_TOP}/third-party/libevent/.libs/libevent.a ++LIBS += -levent + + TRANSLATIONS += transmission_en.ts transmission_ru.ts +