diff --git a/transmission-libsystemd.patch b/transmission-libsystemd.patch new file mode 100644 index 0000000..5d8c7ad --- /dev/null +++ b/transmission-libsystemd.patch @@ -0,0 +1,47 @@ +diff -up ./configure.orig ./configure +--- ./configure.orig 2016-03-06 23:24:37.116078717 +0300 ++++ ./configure 2017-04-13 23:25:44.643463654 +0300 +@@ -19160,12 +19160,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_SYSTEMD_DAEMON_CFLAGS="$SYSTEMD_DAEMON_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` ++ pkg_cv_SYSTEMD_DAEMON_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -19178,12 +19178,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_SYSTEMD_DAEMON_LIBS="$SYSTEMD_DAEMON_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` ++ pkg_cv_SYSTEMD_DAEMON_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -19202,9 +19202,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsystemd-daemon"` ++ SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsystemd"` + else +- SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsystemd-daemon"` ++ SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsystemd"` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5 diff --git a/transmission.spec b/transmission.spec index 37db633..b8692d0 100644 --- a/transmission.spec +++ b/transmission.spec @@ -2,7 +2,7 @@ Name: transmission Version: 2.92 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight GTK+ BitTorrent client Group: Applications/Internet @@ -13,6 +13,7 @@ Source0: http://download.transmissionbt.com/files/transmission-%{version} # https://bugzilla.redhat.com/show_bug.cgi?id=1221292 Source1: https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/transmission-symbolic.svg #Patch0: transmission-2.84-overshoot.patch +Patch1: transmission-libsystemd.patch BuildRequires: compat-openssl10-devel >= 0.9.4 BuildRequires: glib2-devel >= 2.32.0 @@ -91,6 +92,7 @@ exit 0 %setup -q #%%patch0 -p0 +%patch1 -p0 # fix icon location for Transmission Qt sed -i 's|Icon=%{name}-qt|Icon=%{name}|g' qt/%{name}-qt.desktop @@ -101,14 +103,11 @@ mv AUTHORS.new AUTHORS iconv --from=ISO-8859-1 --to=UTF-8 NEWS > NEWS.new mv NEWS.new NEWS -# Correct unit file service type -sed -i s/notify/simple/g daemon/transmission-daemon.service - %build CXXFLAGS="%{optflags} -fPIC" -%configure --disable-static --enable-utp --enable-daemon \ +%configure --disable-static --enable-utp --enable-daemon --with-systemd-daemon \ --enable-nls --enable-cli --enable-daemon \ --enable-external-natpmp make %{?_smp_mflags} @@ -253,6 +252,9 @@ fi %doc %{_mandir}/man1/transmission-qt.* %changelog +* Mon Apr 17 2017 Gwyn Ciesla - 2.92-6 +- Restore systemd usage. + * Thu Apr 13 2017 Gwyn Ciesla - 2.92-5 - Correct unit file service type, BZ 1442085.