[mtr] spec: rebuild using upstream tarball

Michal Sekletar msekleta at fedoraproject.org
Fri Oct 18 14:26:34 UTC 2013


commit 669b407bfdd17a4313946d0dd0ed84961f498fe8
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Fri Oct 18 16:07:25 2013 +0200

    spec: rebuild using upstream tarball
    
    We don't need generate-tarball.sh since upstream regenerated tarball with
    sources and it no longer includes binary blobs.
    
    Resolves: #1020926

 mtr.spec |   17 +++++++++--------
 sources  |    3 +--
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/mtr.spec b/mtr.spec
index 6d92db7..97c513f 100644
--- a/mtr.spec
+++ b/mtr.spec
@@ -3,17 +3,15 @@
 Summary: A network diagnostic tool
 Name: mtr
 Version: 0.85
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 2
 Group: Applications/Internet
 License: GPLv2+
 URL: http://www.BitWizard.nl/mtr
-Source: %{name}-%{version}.tar.xz
+Source: ftp://ftp.bitwizard.nl/mtr/%{name}-%{version}.tar.gz
 Source1: net-x%{name}.desktop
-# script will remove all object files from upstream tarball
-Source2: generate-tarball.sh
-Source3: mtr-gtk-pkexec-wrapper.sh
-Source4: org.fedoraproject.mtr.policy
+Source2: mtr-gtk-pkexec-wrapper.sh
+Source3: org.fedoraproject.mtr.policy
 
 Patch1: mtr-crash-in-xml-mode.patch
 Patch2: mtr-xml-format-fixes.patch
@@ -64,8 +62,8 @@ make %{?_smp_mflags}
 %install
 install -D -p -m 0755 mtr %{buildroot}/%{_sbindir}/mtr
 install -D -p -m 0755 xmtr.bin %{buildroot}/%{_bindir}/xmtr.bin
-install -D -p -m 0755 %{SOURCE3} %{buildroot}/%{_bindir}/xmtr
-install -D -p -m 644 %{SOURCE4} %{buildroot}/%{_datadir}/polkit-1/actions/org.fedoraproject.mtr.policy
+install -D -p -m 0755 %{SOURCE2} %{buildroot}/%{_bindir}/xmtr
+install -D -p -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/polkit-1/actions/org.fedoraproject.mtr.policy
 install -D -p -m 644 img/mtr_icon.xpm %{buildroot}/%{_datadir}/pixmaps/mtr_icon.xpm
 make DESTDIR=%{buildroot} install
 
@@ -95,6 +93,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Fri Oct 18 2013 Michal Sekletar <msekleta at redhat.com> - 2:0.85-4
+- rebuild with new upstream tarball for release 0.85 (#1020926)
+
 * Tue Oct 01 2013 Michal Sekletar <msekleta at redhat.com> - 2:0.85-3
 - enable hardened build
 - migrate from consolehelper to policykit (#502750)
diff --git a/sources b/sources
index 8b71876..2253cc9 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 cf6e427e5ce1d342057aec1a1544e089  net-xmtr.desktop
 c4fb53f4fdb3bbccdace06d34be87dd0  org.fedoraproject.mtr.policy
 8a65f6aec5e2d5f1a665aa76ae649bc9  mtr-gtk-pkexec-wrapper.sh
-c1dc8d422b384491dba9933ebf954bb1  mtr-0.85.tar.xz
-67a4828b875b54e2ba74a90dcfb1774a  generate-tarball.sh
+5e665c617e5659b6ec3e201ee7488eb1  mtr-0.85.tar.gz


More information about the scm-commits mailing list