diff --git a/fix-optflags.patch b/fix-optflags.patch deleted file mode 100644 index 238176d..0000000 --- a/fix-optflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 libevent - diff --git a/transmission-daemon-systemd b/transmission-daemon-systemd index c0ac6c2..6743c06 100644 --- a/transmission-daemon-systemd +++ b/transmission-daemon-systemd @@ -1,13 +1,10 @@ -# To customize, copy this file to /etc/systemd/system and edit there - [Unit] Description=Transmission BT Client headless After=syslog.target network.target [Service] User=transmission -ExecStart=/usr/bin/transmission-daemon -f -T --blocklist -g /var/lib/transmission/.config/transmission -StandardError=syslog +ExecStart=/usr/bin/transmission-daemon -f --blocklist -g /var/lib/transmission/.config/transmission [Install] WantedBy=multi-user.target diff --git a/transmission-qt.desktop b/transmission-qt.desktop deleted file mode 100644 index 836abf3..0000000 --- a/transmission-qt.desktop +++ /dev/null @@ -1,11 +0,0 @@ - -[Desktop Entry] -Name=Qtransmission Bittorrent Client -GenericName=BitTorrent Client -Comment=Download and share files over BitTorrent -Exec=transmission-qt %F -Icon=transmission -Terminal=false -Type=Application -MimeType=application/x-bittorrent; -Categories=Network;FileTransfer;P2P;Qt; diff --git a/transmission.spec b/transmission.spec index a6dc7ad..3d42f3c 100644 --- a/transmission.spec +++ b/transmission.spec @@ -1,5 +1,5 @@ Name: transmission -Version: 2.75 +Version: 2.76 Release: 1%{?dist} Summary: A lightweight GTK+ BitTorrent client @@ -8,9 +8,8 @@ Group: Applications/Internet License: MIT and GPLv2 URL: http://www.transmissionbt.com Source0: http://download.transmissionbt.com/files/transmission-%{version}.tar.xz -Source1: transmission-qt.desktop # systemd unit definition -Source2: transmission-daemon-systemd +Source1: transmission-daemon-systemd BuildRequires: openssl-devel >= 0.9.4 BuildRequires: glib2-devel >= 2.32.0 BuildRequires: gtk3-devel >= 3.2.0 @@ -22,8 +21,6 @@ BuildRequires: libevent-devel >= 2.0.10 BuildRequires: desktop-file-utils BuildRequires: gettext intltool BuildRequires: qt4-devel -# this modification applies to the Qt qtr.pro file -Patch1: fix-optflags.patch Requires: transmission-cli Requires: transmission-gtk @@ -90,7 +87,6 @@ exit 0 %prep %setup -q -%patch1 -p1 iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new mv AUTHORS.new AUTHORS @@ -103,27 +99,25 @@ mv NEWS.new NEWS make %{?_smp_mflags} pushd qt -qmake-qt4 qtr.pro +qmake-qt4 QMAKE_LFLAGS="$RPM_LD_FLAGS" qtr.pro make %{?_smp_mflags} popd %install mkdir -p %{buildroot}%{_unitdir} - -install -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/transmission-daemon.service - +install -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/transmission-daemon.service mkdir -p %{buildroot}/var/lib/transmission - -make install DESTDIR=%{buildroot} - +%make_install make install INSTALL_ROOT=%{buildroot}%{_prefix} -C qt %find_lang %{name}-gtk desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gtk.desktop -desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} - +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications/ \ + qt/%{name}-qt.desktop + %post common touch --no-create %{_datadir}/icons/hicolor || : @@ -206,6 +200,13 @@ update-desktop-database > /dev/null 2>&1 || : %doc %{_mandir}/man1/transmission-qt.* %changelog +* Sat Jan 19 2013 Rahul Sundaram - 2.76-1 +- upstream release 2.76 +- https://trac.transmissionbt.com/wiki/Changes#version-2.76 +- use rpm ld_flags for qt build. resolves rhbz#868502 +- use upstream transmission-qt.desktop file. resolves rhbz#799673 +- remove -T parameter from the systemd file. resolves rhz#823220 + * Sat Dec 15 2012 Rahul Sundaram - 2.75-1 - upstream release 2.75 - https://trac.transmissionbt.com/wiki/Changes#version-2.75