[gts/el6] Update to new upstream snapshot Drop patches already upstreamed

Jonathan G. Underwood jgu at fedoraproject.org
Mon Dec 5 14:42:45 UTC 2011


commit 366b872356be2abc3a0e8acc88a68b15dac24095
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Mon Dec 5 14:42:21 2011 +0000

    Update to new upstream snapshot
    Drop patches already upstreamed

 .gitignore                   |    1 +
 gts-0.7.6-autotools.diff.bz2 |  Bin 141399 -> 0 bytes
 gts-0.7.6-hacks.diff         |  508 ------------------------------------------
 gts-0.7.6-netpbm.patch       |   12 -
 gts.spec                     |   22 +-
 sources                      |    2 +-
 6 files changed, 12 insertions(+), 533 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31fefd2..41d5f13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gts-0.7.6.tar.gz
+/gts-snapshot-111025.tar.gz
diff --git a/gts.spec b/gts.spec
index 6e62f83..efdcfeb 100644
--- a/gts.spec
+++ b/gts.spec
@@ -1,17 +1,14 @@
+%global snapshot 111025
+
 Name:           gts
 Version:        0.7.6
-Release:        17%{?dist}
+Release:        18.20%{snapshot}%{?dist}
 Summary:        GNU Triangulated Surface Library
 Group:          Applications/Engineering
 License:        LGPLv2+
 URL:            http://gts.sourceforge.net/index.html
-Source0:        http://prdownloads.sourceforge.net/gts/gts-0.7.6.tar.gz
+Source0:        http://gts.sourceforge.net/tarballs/gts-snapshot-%{snapshot}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:         gts-0.7.6-hacks.diff
-
-Patch10:	gts-0.7.6-autotools.diff.bz2
-# https://bugzilla.redhat.com/show_bug.cgi?id=538971
-Patch11:	gts-0.7.6-netpbm.patch
 
 BuildRequires:  glib2-devel
 BuildRequires:  netpbm-devel
@@ -33,11 +30,7 @@ set operations (union, intersection, differences).
 This package contains the gts header files and libs.
 
 %prep
-%setup -q
-%patch0 -p1
-
-%patch10 -p1
-%patch11 -p1 -b .netpbm
+%setup -q -n %{name}-snapshot-%{snapshot}
 
 # Fix broken permissions
 chmod +x test/*/*.sh
@@ -88,8 +81,13 @@ make check ||:
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
 %{_datadir}/aclocal/*
+%{_mandir}/man1/*
 
 %changelog
+* Mon Dec  5 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.7.6-18.20111025
+- Update to new upstream snapshot
+- Drop patches already upstreamed
+
 * Tue Nov 29 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0.7.6-17
 - First build for EPEL6
 
diff --git a/sources b/sources
index acd0dbe..e77d309 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f710aefd2ed9b3cc1b1216171fc5a8a  gts-0.7.6.tar.gz
+a9f715a757ab957b62e47c49ca56c8cb  gts-snapshot-111025.tar.gz


More information about the scm-commits mailing list