diff --git a/transmission.spec b/transmission.spec index 2e0971d..5ef4fd7 100644 --- a/transmission.spec +++ b/transmission.spec @@ -1,23 +1,19 @@ %global _hardened_build 1 Name: transmission -Version: 2.92 -Release: 13%{?dist} +Version: 2.93 +Release: 1%{?dist} Summary: A lightweight GTK+ BitTorrent client # See COPYING. This licensing situation is... special. License: MIT and GPLv2 URL: http://www.transmissionbt.com -Source0: http://download.transmissionbt.com/files/transmission-%{version}.tar.xz +Source0: https://github.com/transmission/transmission-releases/raw/master/transmission-%{version}.tar.xz # 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 Patch2: transmission-fdlimits.patch -# https://github.com/transmission/transmission/pull/468 -Patch3: CVE-2018-5702.patch -# Cherry-picked from upstream -Patch4: 0001-transmission-build-against-openssl-1.1.0.patch BuildRequires: openssl-devel >= 1.1.0 BuildRequires: glib2-devel >= 2.32.0 @@ -46,8 +42,8 @@ Summary: Transmission common files 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, transmission-create, +Common files for Transmission BitTorrent client sub-packages. It includes +the web user interface, icons and transmission-remote, transmission-create, transmission-edit, transmission-show utilities. %package cli @@ -93,13 +89,7 @@ useradd -r -g transmission -d %{_sharedstatedir}/transmission -s /sbin/nologin \ exit 0 %prep -%setup -q - -#%%patch0 -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p1 -%patch4 -p1 +%autosetup -p0 # fix icon location for Transmission Qt sed -i 's|Icon=%{name}-qt|Icon=%{name}|g' qt/%{name}-qt.desktop @@ -117,22 +107,22 @@ CXXFLAGS="%{optflags} -fPIC" %configure --disable-static --enable-utp --enable-daemon --with-systemd-daemon \ --enable-nls --enable-cli --enable-daemon \ --enable-external-natpmp -make %{?_smp_mflags} +%make_build pushd qt %{qmake_qt5} qtr.pro - make %{?_smp_mflags} + %make_build popd %check -make %{?_smp_mflags} check +%make_build check %install mkdir -p %{buildroot}%{_unitdir} install -m0644 daemon/transmission-daemon.service %{buildroot}%{_unitdir}/ mkdir -p %{buildroot}%{_sharedstatedir}/transmission %make_install -make install INSTALL_ROOT=%{buildroot}%{_prefix} -C qt +%make_install INSTALL_ROOT=%{buildroot}%{_prefix} -C qt # Install the symbolic icon mkdir -p %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps @@ -196,11 +186,11 @@ EOF %systemd_preun transmission-daemon.service %postun daemon -%systemd_postun_with_restart transmission-daemon.service +%systemd_postun_with_restart transmission-daemon.service -%files +%files -%files common +%files common %license COPYING %doc AUTHORS NEWS README %{_bindir}/transmission-remote @@ -216,7 +206,7 @@ EOF %doc %{_mandir}/man1/transmission-edit* %doc %{_mandir}/man1/transmission-show* -%files cli +%files cli %{_bindir}/transmission-cli %doc %{_mandir}/man1/transmission-cli*