[transmission/el6] Importing latest upstream (Fedora) into EL6
Adam Miller
maxamillion at fedoraproject.org
Mon Nov 21 16:59:51 UTC 2011
commit 7d6650eadbf7ed5be9678829b125f16413aa9b96
Author: Adam Miller <maxamillion at fedoraproject.org>
Date: Mon Nov 21 10:59:37 2011 -0600
Importing latest upstream (Fedora) into EL6
.gitignore | 1 +
fix-optflags.patch | 11 ++
sources | 2 +-
transmission-daemon-init | 102 ----------------
transmission-daemon-sysconfig | 5 -
transmission-daemon-systemd | 13 ++
qtr.desktop => transmission-qt.desktop | 2 +-
transmission.spec | 208 +++++++++++++++++++++++---------
use-system-libevent-fix-optflags-patch | 20 ---
9 files changed, 179 insertions(+), 185 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ae1810..0d1f0bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
transmission-1.83.tar.xz
+/transmission-2.42.tar.xz
diff --git a/fix-optflags.patch b/fix-optflags.patch
new file mode 100644
index 0000000..238176d
--- /dev/null
+++ b/fix-optflags.patch
@@ -0,0 +1,11 @@
+--- 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/sources b/sources
index 1063cce..676a402 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3963c6fb1af8db37134e7f0a37a45b98 transmission-1.93.tar.xz
+50f6dd76c5c01f45d5ed20783c686815 transmission-2.42.tar.xz
diff --git a/transmission-daemon-systemd b/transmission-daemon-systemd
new file mode 100644
index 0000000..c0ac6c2
--- /dev/null
+++ b/transmission-daemon-systemd
@@ -0,0 +1,13 @@
+# 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
+
+[Install]
+WantedBy=multi-user.target
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 d56afc3..cef7a5f 100644
--- a/transmission.spec
+++ b/transmission.spec
@@ -1,19 +1,17 @@
Name: transmission
-Version: 1.93
-Release: 1%{?dist}
-Summary: A fast and easy lightweight BitTorrent client
+Version: 2.42
+Release: 2%{?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
+URL: http://www.transmissionbt.com
+Source0: http://download.transmissionbt.com/files/transmission-%{version}.tar.xz
# This is intended to be merged by upstream post 1.80 release
-Source1: qtr.desktop
-# init script. Upstream doesn't want it because it is distro specific
-Source2: transmission-daemon-init
-# Example conf file
-Source3: transmission-daemon-sysconfig
+Source1: transmission-qt.desktop
+# systemd unit definition
+Source2: transmission-daemon-systemd
BuildRequires: openssl-devel >= 0.9.4
BuildRequires: glib2-devel >= 2.15.5
BuildRequires: gtk2-devel >= 2.6.0
@@ -24,12 +22,13 @@ BuildRequires: dbus-glib-devel >= 0.70
BuildRequires: libevent-devel >= 1.4.5
BuildRequires: desktop-file-utils
BuildRequires: gettext intltool
-BuildRequires: GConf2-devel
BuildRequires: qt4-devel
# this modification applies to the Qt qtr.pro file
-Patch1: use-system-libevent-fix-optflags-patch
+Patch1: 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
@@ -41,7 +40,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
@@ -56,10 +56,10 @@ Summary: Transmission daemon
Group: Applications/Internet
Requires: transmission-common
Requires(pre): shadow-utils
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+BuildRequires: systemd-units
Provides: transmission = %{version}-%{release}
%description daemon
Transmission BitTorrent client daemon.
@@ -93,8 +93,14 @@ exit 0
%setup -q
%patch1 -p1
+iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new
+mv AUTHORS.new AUTHORS
+iconv --from=ISO-8859-1 --to=UTF-8 NEWS > NEWS.new
+mv NEWS.new NEWS
+
%build
-%configure --disable-static --with-gtk --without-wx --enable-libcanberra --enable-libnotify --enable-daemon
+%configure --disable-static --enable-utp --enable-libnotify --enable-daemon \
+ --enable-nls --enable-cli --enable-daemon --with-gnu-ld
make %{?_smp_mflags}
pushd qt
@@ -104,11 +110,9 @@ popd
%install
-mkdir -p %{buildroot}%{_initddir}
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_unitdir}
-install -m755 %{SOURCE2} %{buildroot}%{_initddir}/transmission-daemon
-install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/transmission-daemon
+install -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/transmission-daemon.service
mkdir -p %{buildroot}/var/lib/transmission
@@ -116,19 +120,20 @@ 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}
-%clean
-rm -rf %{buildroot}
%post common
touch --no-create %{_datadir}/icons/hicolor || :
%post daemon
-/sbin/chkconfig --add transmission-daemon
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
%post gtk
update-desktop-database > /dev/null 2>&1 || :
@@ -138,8 +143,8 @@ update-desktop-database > /dev/null 2>&1 || :
%preun daemon
if [ $1 = 0 ] ; then
- /sbin/service transmission-daemon stop >/dev/null 2>&1
- /sbin/chkconfig --del transmission-daemon
+ /bin/systemctl stop transmission-daemon.service >/dev/null 2>&1 || :
+ /bin/systemctl disable transmission-daemon.service >/dev/null 2>&1 || :
fi
%postun common
@@ -149,8 +154,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
fi
%postun daemon
-if [ "$1" -ge "1" ] ; then
- /sbin/service transmission-daemon condrestart >/dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart transmission-daemon.service >/dev/null 2>&1 || :
fi
%postun gtk
@@ -166,48 +173,137 @@ update-desktop-database > /dev/null 2>&1 || :
%files
%files common
-%defattr(-, root, root, -)
%doc AUTHORS COPYING NEWS README
%{_bindir}/transmission-remote
-%{_datadir}/transmission/web/
+%{_bindir}/transmission-create
+%{_bindir}/transmission-edit
+%{_bindir}/transmission-show
+%{_datadir}/transmission/
%{_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, -)
%{_bindir}/transmission-daemon
-%{_initddir}/transmission-daemon
-%config(noreplace) %{_sysconfdir}/sysconfig/transmission-daemon
+%{_unitdir}/transmission-daemon.service
%attr(-,transmission, transmission)/var/lib/transmission/
%doc %{_mandir}/man1/transmission-daemon*
-%files gtk -f %{name}.lang
-%defattr(-, root, root, -)
-%{_bindir}/transmission
-%{_datadir}/applications/transmission.desktop
-%doc %{_mandir}/man1/transmission.*
+%files gtk -f %{name}-gtk.lang
+%{_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
-* Mon May 03 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 1.93-1
-- Many bug fixes
-- Drop merged patches
-- http://trac.transmissionbt.com/query?milestone=1.93&group=component&groupdesc=1&order=severity
-
-* Thu Apr 15 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.92-2
-- Patches applied
-- http://trac.transmissionbt.com/changeset/10463/#file0 - https://bugs.launchpad.net/ubuntu/+source/transmission/+bug/538580
-- http://transmission.pastebay.com/90665 - https://bugs.launchpad.net/ubuntu/+source/transmission/+bug/542194
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.42-2
+- Rebuilt for glibc bug#747377
+
+* Sat Oct 23 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 2.42-1
+- upstream release 2.42
+- https://trac.transmissionbt.com/wiki/Changes#version-2.42
+
+* Sat Sep 10 2011 Tomasz Torcz <ttorcz at fedoraproject.org> - 2.33-2
+- add systemd unit (#659919)
+- drop sysconfig file
+
+* Sun Aug 14 2011 Rex Dieter <rdieter at fedoraproject.org> - 2.33-1.1
+- Rebuilt for rpm (#728707)
+
+* Thu Jul 21 2011 Raghu Udiyar <raghusiddarth at gmail.com> - 2.33-1
+- https://trac.transmissionbt.com/wiki/Changes#version-2.33
+- Remove deprecated gconf2 dependency
+
+* Tue Jul 05 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 2.32-1
+- Upstream 2.32 release
+- https://trac.transmissionbt.com/wiki/Changes#version-2.32
+- Drop defattr throughout the spec since recent RPM makes it redundant
+
+* Sun Apr 24 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 2.31-1
+- Upstream 2.31 release
+- https://trac.transmissionbt.com/wiki/Changes#version-2.31
+- Fix source url
+
+* Sun Apr 24 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 2.30-0.b3
+- Upstream 2.30 Beta 3 release
+- https://trac.transmissionbt.com/wiki/Changes#version-2.30b3
+
+* Mon Apr 04 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 2.30-0.b1
+- Upstream 2.30 Beta 1 release
+- Enable configure options explicitly
+- Drop source and patch for icons since it is now upstream
+- https://trac.transmissionbt.com/wiki/Changes#version-2.30b1
+ * Major changes include the following:
+ * µTP, UDP tracker, Multiscrape support
+ * Download scarcest pieces first
+ * The "lazy bitfield" feature has been superseded by the "Fast Extension" BEP6
+ * GTK: Register as a magnet link handler in the .desktop file
+ * Web: Peer and Network preferences
+
+* Thu Mar 10 2011 Bastien Nocera <bnocera at redhat.com> 2.22-2
+- Add new icons
+
+* Thu Mar 10 2011 Bastien Nocera <bnocera at redhat.com> 2.22-1
+- Update to 2.22
+
+* Wed Mar 2 2011 Ville Skyttä <ville.skytta at iki.fi> - 2.21-2
+- Own %%{_datadir}/transmission dir.
+
+* Wed Feb 09 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 2.21-1
+- Update to latest upstream release
+- Drop no longer needed libnotify patch
+- https://trac.transmissionbt.com/wiki/Changes
+
+* Tue Dec 28 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.13-1
+- updated to latest upstream release: https://trac.transmissionbt.com/wiki/Changes
+- fixes #654793
+- update libnotify patch
+
+* Sun Nov 07 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.11-3
+- fix build errors
+- update patch to fix another libnotify breakage
+
+* Sun Nov 07 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.11-2
+- added patch to fix breakage for libnotify API changes
+
+* Thu Oct 21 2010 Pavol Šimo <palos AT fedoraproject DOT org> - 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
+
+* Mon Sep 20 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.04-2
+- Added patch to fix https://trac.transmissionbt.com/ticket/3539
+
+* Mon Aug 09 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.04-1
+- Updated to latest release
+- bug 622239
+
+* Wed Jul 21 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.03-1
+- updated to latest release version
+- bug 616745
+
+* Sun Jun 27 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.01-2
+- corrected build failure
+
+* Sun Jun 27 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.01-1
+- https://trac.transmissionbt.com/wiki/Changes
+
+* Thu Jun 17 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 2.00-1
+- https://trac.transmissionbt.com/wiki/Changes?version=57
+- Drop the clean section as it is redundant now
* Fri Mar 12 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 1.92-1
- Some bug fixes
More information about the scm-commits
mailing list