diff --git a/fix-optflags.patch b/fix-optflags.patch index 62fc760..fe9ea6e 100644 --- a/fix-optflags.patch +++ b/fix-optflags.patch @@ -1,11 +1,11 @@ ---- transmission-2.00/qt/qtr.pro.orig 2010-06-17 14:27:33.180210795 +0530 -+++ transmission-2.00/qt/qtr.pro 2010-06-17 14:28:57.149086198 +0530 -@@ -7,7 +7,7 @@ - target.path = /bin - INSTALLS += target +--- transmission-2.11/qt/qtr.pro.orig 2010-10-17 02:14:40.000000000 +0200 ++++ transmission-2.11/qt/qtr.pro 2010-10-20 21:55:19.000000000 +0200 +@@ -11,7 +11,7 @@ + man.path = /share/man/man1/ + man.files = transmission-qt.1 -CONFIG += qt qdbus thread debug link_pkgconfig +CONFIG += qt qdbus thread release link_pkgconfig QT += network - PKGCONFIG = fontconfig libcurl openssl + PKGCONFIG = fontconfig libcurl openssl dbus-1 diff --git a/transmission-3539.patch b/transmission-3539.patch deleted file mode 100644 index ea4ddba..0000000 --- a/transmission-3539.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur ../transmission-2.04.orig/libtransmission/torrent-magnet.c ./libtransmission/torrent-magnet.c ---- ../transmission-2.04.orig/libtransmission/torrent-magnet.c 2010-08-07 09:04:35.000000000 +0530 -+++ ./libtransmission/torrent-magnet.c 2010-09-20 13:32:57.160346620 +0530 -@@ -116,7 +116,7 @@ - int infoLen; - char * infoContents = tr_bencToStr( infoDict, TR_FMT_BENC, &infoLen ); - const uint8_t * i = (const uint8_t*) tr_memmem( (char*)fileContents, fileLen, infoContents, infoLen ); -- offset = i == NULL ? i - fileContents : 0; -+ offset = i != NULL ? i - fileContents : 0; - tr_free( infoContents ); - } - diff --git a/qtr.desktop b/transmission-qt.desktop similarity index 91% rename from qtr.desktop rename to transmission-qt.desktop index f7a7592..836abf3 100644 --- a/qtr.desktop +++ b/transmission-qt.desktop @@ -3,7 +3,7 @@ Name=Qtransmission Bittorrent Client GenericName=BitTorrent Client Comment=Download and share files over BitTorrent -Exec=qtr %F +Exec=transmission-qt %F Icon=transmission Terminal=false Type=Application diff --git a/transmission.spec b/transmission.spec index ed4082e..5a6a119 100644 --- a/transmission.spec +++ b/transmission.spec @@ -1,6 +1,6 @@ Name: transmission -Version: 2.04 -Release: 3%{?dist} +Version: 2.11 +Release: 1%{?dist} Summary: A lightweight GTK+ BitTorrent client Group: Applications/Internet @@ -9,7 +9,7 @@ License: MIT and GPLv2 URL: http://www.transmissionbt.com/ Source0: http://download.m0k.org/transmission/files/transmission-%{version}.tar.xz # This is intended to be merged by upstream post 1.80 release -Source1: qtr.desktop +Source1: transmission-qt.desktop # init script. Upstream doesn't want it because it is distro specific Source2: transmission-daemon-init # Example conf file @@ -28,7 +28,6 @@ BuildRequires: GConf2-devel BuildRequires: qt4-devel # this modification applies to the Qt qtr.pro file Patch1: fix-optflags.patch -Patch2: transmission-3539.patch Requires: transmission-cli Requires: transmission-gtk %description @@ -42,7 +41,8 @@ Group: Applications/Internet Conflicts: transmission < 1.80-0.3.b4 %description common Common files for Transmission BitTorrent client sub-packages. It includes -the web user interface, icons and transmission-remote utility. +the web user interface, icons and transmission-remote, transmission-create, +transmission-edit, transmission-show utilities. %package cli Summary: Transmission command line implementation @@ -93,7 +93,6 @@ exit 0 %prep %setup -q %patch1 -p1 -%patch2 -p1 %build %configure --disable-static --with-gtk --without-wx --enable-libcanberra --enable-libnotify --enable-daemon @@ -118,9 +117,9 @@ make install DESTDIR=%{buildroot} make install INSTALL_ROOT=%{buildroot}%{_prefix} -C qt -%find_lang %{name} +%find_lang %{name}-gtk -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gtk.desktop desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} @@ -169,15 +168,21 @@ update-desktop-database > /dev/null 2>&1 || : %defattr(-, root, root, -) %doc AUTHORS COPYING NEWS README %{_bindir}/transmission-remote +%{_bindir}/transmission-create +%{_bindir}/transmission-edit +%{_bindir}/transmission-show %{_datadir}/transmission/web/ %{_datadir}/pixmaps/* %{_datadir}/icons/hicolor/*/apps/transmission.* %doc %{_mandir}/man1/transmission-remote* +%doc %{_mandir}/man1/transmission-create* +%doc %{_mandir}/man1/transmission-edit* +%doc %{_mandir}/man1/transmission-show* %files cli %defattr(-, root, root, -) -%{_bindir}/transmissioncli -%doc %{_mandir}/man1/transmissioncli* +%{_bindir}/transmission-cli +%doc %{_mandir}/man1/transmission-cli* %files daemon %defattr(-, root, root, -) @@ -187,18 +192,23 @@ update-desktop-database > /dev/null 2>&1 || : %attr(-,transmission, transmission)/var/lib/transmission/ %doc %{_mandir}/man1/transmission-daemon* -%files gtk -f %{name}.lang +%files gtk -f %{name}-gtk.lang %defattr(-, root, root, -) -%{_bindir}/transmission -%{_datadir}/applications/transmission.desktop -%doc %{_mandir}/man1/transmission.* +%{_bindir}/transmission-gtk +%{_datadir}/applications/transmission-gtk.desktop +%doc %{_mandir}/man1/transmission-gtk.* %files qt %defattr(-, root, root, -) -%{_bindir}/qtr -%{_datadir}/applications/qtr.desktop +%{_bindir}/transmission-qt +%{_datadir}/applications/transmission-qt.desktop +%doc %{_mandir}/man1/transmission-qt.* %changelog +* Thu Oct 21 2010 Pavol Šimo - 2.11-1 +- updated to latest release version +- added new files, updated fix-optflag.patch + * Wed Sep 29 2010 jkeating - 2.04-3 - Rebuilt for gcc bug 634757