rpms/wiggle/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wiggle.spec, 1.4, 1.5 wiggle-various-changes.patch, 1.1, NONE

[Andy Gospodarek]

Author: gospo

Update of /cvs/pkgs/rpms/wiggle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22678

Modified Files:
	.cvsignore sources wiggle.spec 
Removed Files:
	wiggle-various-changes.patch 
Log Message:
Fixed bug 506812.  It requested that I update the URL/Source0 fields
since they were not quite operational anymore.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wiggle/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Jan 2008 20:58:28 -0000	1.2
+++ .cvsignore	19 Oct 2009 21:29:15 -0000	1.3
@@ -1 +1 @@
-wiggle-0.6.tar.gz
+wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wiggle/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Jan 2008 20:58:28 -0000	1.2
+++ sources	19 Oct 2009 21:29:15 -0000	1.3
@@ -1 +1 @@
-1884607cdebaf730737cb99b2909219b  wiggle-0.6.tar.gz
+7244cf7441c7f54c52f2cdc97fa9f268  wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz


Index: wiggle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wiggle/devel/wiggle.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wiggle.spec	27 Jul 2009 07:16:28 -0000	1.4
+++ wiggle.spec	19 Oct 2009 21:29:15 -0000	1.5
@@ -1,20 +1,30 @@
 Name:           wiggle
 Version:        0.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A tool for applying patches with conflicts
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://www.cse.unsw.edu.au/~neilb/source/wiggle/
-Source0:        http://www.cse.unsw.edu.au/~neilb/source/wiggle/%{name}-%{version}.tar.gz
-Patch0:         wiggle-various-changes.patch
-Patch1:         wiggle-fix-build.patch
+URL:            http://neil.brown.name/git/wiggle
+Source0:        wiggle-1c5bfa7ce4de088e3b942463bb11cdc553a92b97.tar.gz
+Patch0:         wiggle-fix-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  groff, time
 #Requires:       
 
+# The source tarball used, is obtained by visiting the URL above and
+# getting a snapshot that contains the latest sources.  This can be
+# done by clicking the 'snapshot' link listed on the gitweb interface
+# This snapshot was the latest commit on the 'master' branch.
+# 
+# RPM doesn't particularly like this link as a 'Source', so I'll paste
+# is here for posterity:
+#
+# http://neil.brown.name/git?p=wiggle;a=snapshot;h=1c5bfa7ce4de088e3b942463bb11cdc553a92b97;sf=tgz
+#
+
 %description
 Wiggle is a program for applying patches that 'patch' cannot apply due
 to conflicting changes in the original.
@@ -25,9 +35,8 @@ original in a manner similar to 'merge',
 conflict.
 
 %prep
-%setup -q
+%setup -q -n wiggle
 %patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
@@ -50,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 19 2009 Andy Gospodarek <gospo at redhat.com> 0.6-7
+- Updated location for wiggle sources and uploaded new source-file. [506812]
+- Dropped first patch since it was now included.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- wiggle-various-changes.patch DELETED ---