OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quilt?expand=0&rev=14

quilt-0.46_cvs20071105.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1a12a0bba8d08bf0c79bce39e7fc5ef62d906ea3f537f36fccab86204d6f8ac
-size 376770

quilt-0.46_cvs20080326.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d0e3b48ba31053ef8fc1b6747ca83963390fda8c81ece2a641c0934dab84fbd
+size 376691

quilt.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar 26 00:11:27 CET 2008 - agruen@suse.de
+
+- Assume patches are in unified format by default when applying
+  them. (For working with other patch formats, make sure to remove
+  "--unified" from QUILT_PATCH_OPTS in ~/.quiltrc or
+  /etc/quilt.quiltrc.)
+
 -------------------------------------------------------------------
 Tue Feb 12 19:40:38 CET 2008 - jeffm@suse.com
 

quilt.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package quilt (Version 0.46_cvs20071105)
+# spec file for package quilt (Version 0.46_cvs20080326)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -16,16 +16,15 @@ BuildRequires:  diffstat ed procmail
 Summary:        A Tool for Working with Many Patches
 License:        GPL v2 or later
 Group:          Productivity/Text/Utilities
-Version:        0.46_cvs20071105
+Version:        0.46_cvs20080326
-Release:        24
+Release:        1
 Requires:       coreutils diffutils patch gzip bzip2 perl mktemp diffstat procmail
 AutoReqProv:    off
 Source:         %{name}-%{version}.tar.bz2
 Source1:        suse-start-quilt-mode.el
 Patch1:         expand.diff
 Patch2:         docdir.diff
-Patch3:         quiltrc.diff
+Patch3:         patch-wrapper-rpm.diff
-Patch4:         patch-wrapper-rpm.diff
 Url:            http://savannah.nongnu.org/projects/quilt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -45,7 +44,7 @@ Authors:
 
 %prep
 %setup -q
-%patch -p1 -P 1 -P 2 -P 3 -P 4
+%patch -p1 -P 1 -P 2 -P 3
 
 %build
 autoconf
@@ -107,6 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/quilt.pdf
 
 %changelog
+* Wed Mar 26 2008 agruen@suse.de
+- Assume patches are in unified format by default when applying
+  them. (For working with other patch formats, make sure to remove
+  "--unified" from QUILT_PATCH_OPTS in ~/.quiltrc or
+  /etc/quilt.quiltrc.)
 * Tue Feb 12 2008 jeffm@suse.com
 - Added dependency on procmail (formail)
 * Mon Nov 05 2007 bwalle@suse.de

quiltrc.diff

@@ -1,16 +0,0 @@
-Index: quilt-0.46/quilt.quiltrc
-===================================================================
---- quilt-0.46.orig/quilt.quiltrc
-+++ quilt-0.46/quilt.quiltrc
-@@ -1,9 +1,9 @@
--# Example /etc/quilt.quiltrc
-+# /etc/quilt.quiltrc
- 
- # Options passed to GNU diff when generating patches
- QUILT_DIFF_OPTS="--show-c-function"
- # Options passed to GNU patch when applying patches
--#QUILT_PATCH_OPTS="--ignore-whitespace"
-+QUILT_PATCH_OPTS="--ignore-whitespace --unified-reject"
- # Options passed to diffstat when generating patch statistics
- #QUILT_DIFFSTAT_OPTS="-f0"
-