commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2019-04-02 09:16:38
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new.25356 (New)
Package is "quilt"
Tue Apr 2 09:16:38 2019 rev:71 rq:689914 version:0.66
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2018-05-06
15:00:18.843568160 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new.25356/quilt.changes 2019-04-02
09:16:43.420428485 +0200
@@ -1,0 +2,44 @@
+Fri Mar 29 16:06:38 UTC 2019 - Jean Delvare
+
+- test-faildiff-workaround-order-bug.patch: Avoid false-positive
+ test suite failures in the build service.
+
+---
+Fri Mar 29 15:34:44 UTC 2019 - Jean Delvare
+
+- Update to version 0.66:
+ * Add support for lzip archives and patches
+ * Document QUILT_PC as user-settable
+ * configure: Don't require md5sum
+ * Test suite: Allow keeping the working directory on failure
+ * Test suite: Fix /bin/sh filtering
+ * Test suite: Run tests again if test.quiltrc changes
+ * Test suite: Handle alternative QUILT_PATCHES values
+ * Test suite: Increase code path coverage
+ * Test suite: Be verbose on directory error
+ * Test suite: Clean up when interrupted
+ * Test suite: Prevent test cases from escaping
+ * diff: Add missing quotes in basename call
+ * header: Fix corruption when trailing newline is missing
+ * mail: Remove Content-Disposition headers
+ * mail: Complain when a patch doesn't exist
+ * new: Fix corruption when trailing newline is missing
+ * refresh: Add missing quotes in basename call
+ * setup: Add basic support for p7zip (.7z) archives
+ * setup: Align --fast on --slow for series files
+ * quilt.el: Define quilt-edit-top-only before it's used
+ * quilt.el: Stop using deprecated toggle-read-only
+ * quilt.el: Don't strip directory in quilt-top-patch
+ * quilt.el: Fix emacs compatibility issue
+ * quilt.el: Read QUILT_PC from config file
+ * guards: Mention it in quilt manual page
+ * compat/getopt: Handle a second separator
+ * compat/getopt: Allow non-digit parameter embedded in short option
+ * Obsoletes mail-fix-patch-set-threading.patch
+ * Obsoletes patch-wrapper-rpm.diff
+ * Obsoletes perl-526.patch
+ * Obsoletes quilt-translations.patch
+ * Obsoletes quiltrc-support-all-patch-formats-by-default.patch
+- Refresh suse-workaround-pseudo-release.patch
+
+---
Old:
mail-fix-patch-set-threading.patch
patch-wrapper-rpm.diff
perl-526.patch
quilt-0.65.tar.bz2
quilt-translations.patch
quiltrc-support-all-patch-formats-by-default.patch
New:
quilt-0.66.tar.bz2
test-faildiff-workaround-order-bug.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.AcSKMu/_old 2019-04-02 09:16:43.932429029 +0200
+++ /var/tmp/diff_new_pack.AcSKMu/_new 2019-04-02 09:16:43.932429029 +0200
@@ -1,7 +1,7 @@
#
# spec file for package quilt
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,15 +12,15 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: quilt
-Version:0.65
+Version:0.66
Release:0
Summary:A Tool for Working with Many Patches
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Development/Tools/Version Control
BuildRequires: diffstat
BuildRequires: ed
@@ -40,12 +40,8 @@
Source1:suse-start-quilt-mode.el
Patch1: expand.diff
Patch2: quilt-support-vimdiff.patch
-Patch3: patch-wrapper-rpm.diff
+Patch3: test-faildiff-workaround-order-bug.patch
Patch4: suse-workaround-pseudo-release.patch
-Patch5: mail-fix-patch-set-threading.patch
-Patch6: quilt-translations.patch
-Patch7: perl-526.patch
-Patch8: quiltrc-support-all-patch-formats-by-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -68,10 +64,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ quilt-0.65.tar.bz2 -> quilt-0.66.tar.bz2 ++
5396 lines of diff (skipped)
++
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2018-05-06 15:00:17
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is "quilt"
Sun May 6 15:00:17 2018 rev:70 rq:603634 version:0.65
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2017-10-02
16:45:14.789829580 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2018-05-06
15:00:18.843568160 +0200
@@ -1,0 +2,6 @@
+Thu May 3 08:53:20 CEST 2018 - jdelv...@suse.de
+
+- quiltrc-support-all-patch-formats-by-default.patch: quiltrc:
+ Support all patch formats by default (bsc#1088281).
+
+---
New:
quiltrc-support-all-patch-formats-by-default.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.CwAarh/_old 2018-05-06 15:00:20.291515020 +0200
+++ /var/tmp/diff_new_pack.CwAarh/_new 2018-05-06 15:00:20.295514873 +0200
@@ -1,7 +1,7 @@
#
# spec file for package quilt
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,6 +45,7 @@
Patch5: mail-fix-patch-set-threading.patch
Patch6: quilt-translations.patch
Patch7: perl-526.patch
+Patch8: quiltrc-support-all-patch-formats-by-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -70,6 +71,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ quiltrc-support-all-patch-formats-by-default.patch ++
From: Jean Delvare
Date: Thu, 3 May 2018 08:33:24 +0200
Subject: quiltrc: Support all patch formats by default
Git-commit: 6d2c0da841aeaaec60993441bf6899f1909f310d
Patch-mainline: yes
References: bsc#1088281
Passing --unified to patch by default prevents using other patch
formats. Out of curiosity, I checked if it helped with performance
but was not able to measure any improvement. So stop passing
--unified by default.
Signed-off-by: Jean Delvare
diff --git a/quilt.quiltrc b/quilt.quiltrc
index 58f665e..f0ec21e 100644
--- a/quilt.quiltrc
+++ b/quilt.quiltrc
@@ -3,10 +3,8 @@
# Options passed to GNU diff when generating patches
QUILT_DIFF_OPTS="--show-c-function"
-# Options passed to GNU patch when applying patches.
-# (For appling patches which are not in unified format, remove the
"--unified".)
+# Options passed to GNU patch when applying patches
#QUILT_PATCH_OPTS="--ignore-whitespace"
-QUILT_PATCH_OPTS="--unified"
# Options passed to diffstat when generating patch statistics
#QUILT_DIFFSTAT_OPTS="-f0"
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2017-10-02 16:45:10
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is "quilt"
Mon Oct 2 16:45:10 2017 rev:69 rq:528751 version:0.65
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2017-08-08
11:57:14.352928136 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2017-10-02
16:45:14.789829580 +0200
@@ -1,0 +2,5 @@
+Sun Sep 24 10:00:18 UTC 2017 - co...@suse.com
+
+- add perl-526.patch to work with perl 5.26
+
+---
New:
perl-526.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.X4ZQ4e/_old 2017-10-02 16:45:15.621712619 +0200
+++ /var/tmp/diff_new_pack.X4ZQ4e/_new 2017-10-02 16:45:15.625712057 +0200
@@ -44,6 +44,7 @@
Patch4: suse-workaround-pseudo-release.patch
Patch5: mail-fix-patch-set-threading.patch
Patch6: quilt-translations.patch
+Patch7: perl-526.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -68,6 +69,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ perl-526.patch ++
Index: quilt-0.65/test/run
===
--- quilt-0.65.orig/test/run
+++ quilt-0.65/test/run
@@ -111,7 +111,7 @@ sub flush_output()
sub substitute_vars($)
{
my ($line) = @_;
- $line =~ s[%{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg;
+ $line =~ s[%\{(\w+)}][defined $ENV{$1} ? $ENV{$1} : ""]eg;
return $line;
}
@@ -287,7 +287,7 @@ while (defined(my $line = )) {
# Parse the next command
if ($line =~ s/^\s*\$ ?//) {
# Substitute %{?} with the last command's status
- $line =~ s[%{\?}][$last_status]eg;
+ $line =~ s[%\{\?}][$last_status]eg;
chomp($prog = substitute_vars($line));
$prog_line = $lineno;
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2017-08-08 11:57:13
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is "quilt"
Tue Aug 8 11:57:13 2017 rev:68 rq:512346 version:0.65
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2017-06-05
18:51:20.112818822 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2017-08-08
11:57:14.352928136 +0200
@@ -1,0 +2,5 @@
+Fri Jul 21 17:11:23 UTC 2017 - o...@aepfle.de
+
+- Correct fold -R helptext in german locale with quilt-translations.patch
+
+---
New:
quilt-translations.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.doOMth/_old 2017-08-08 11:57:16.440634098 +0200
+++ /var/tmp/diff_new_pack.doOMth/_new 2017-08-08 11:57:16.456631845 +0200
@@ -1,7 +1,7 @@
#
# spec file for package quilt
#
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,6 +43,7 @@
Patch3: patch-wrapper-rpm.diff
Patch4: suse-workaround-pseudo-release.patch
Patch5: mail-fix-patch-set-threading.patch
+Patch6: quilt-translations.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -66,6 +67,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ quilt-translations.patch ++
--- a/po/de.po
+++ b/po/de.po
@@ -433,7 +433,7 @@ msgstr ""
"im obersten Patch enthalten sind, dann wird der neue Patch mit der\n"
"angegebenen Anzahl an Strip-Ebenen angewandt (Standardwert = 1).\n"
"\n"
-"-r\tPatch verkehrt herum anwenden.\n"
+"-R\tPatch verkehrt herum anwenden.\n"
"\n"
"-q\tWenige Meldungen ausgeben.\n"
"\n"
commit quilt for openSUSE:Factory
Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2017-06-05 18:50:57 Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) Package is "quilt" Mon Jun 5 18:50:57 2017 rev:67 rq:501141 version:0.65 Changes: --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2017-04-28 09:11:09.192274017 +0200 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2017-06-05 18:51:20.112818822 +0200 @@ -1,0 +2,5 @@ +Mon May 29 11:24:01 UTC 2017 - jdelv...@suse.de + +- Add missing bug number in changes file (bsc#1041323). + +--- @@ -231 +236,2 @@ -- setup-skip-version-check.patch: setup: Skip version check. +- setup-skip-version-check.patch: setup: Skip version check + (bsc#891332). Other differences: --
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2017-04-28 09:11:07
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is "quilt"
Fri Apr 28 09:11:07 2017 rev:66 rq:489824 version:0.65
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2016-11-11
14:32:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2017-04-28
09:11:09.192274017 +0200
@@ -1,0 +2,10 @@
+Fri Apr 14 13:56:29 CEST 2017 - jdelv...@suse.de
+
+- Change the rpm group. Quilt is a development tool, not a text
+ file editor.
+- We don't need procmail to build quilt.
+- patch-wrapper-rpm.diff: Add a decription and upstream reference.
+- mail-fix-patch-set-threading.patch: mail: Fix patch set threading
+ (regression in version 0.64, savannah bug #50775.)
+
+---
New:
mail-fix-patch-set-threading.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.OGAnNW/_old 2017-04-28 09:11:10.084148255 +0200
+++ /var/tmp/diff_new_pack.OGAnNW/_new 2017-04-28 09:11:10.084148255 +0200
@@ -1,7 +1,7 @@
#
# spec file for package quilt
#
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,11 +21,10 @@
Release:0
Summary:A Tool for Working with Many Patches
License:GPL-2.0+
-Group: Productivity/Text/Utilities
+Group: Development/Tools/Version Control
BuildRequires: diffstat
BuildRequires: ed
BuildRequires: emacs-nox
-BuildRequires: procmail
Requires: coreutils
Requires: diffstat
Requires: diffutils
@@ -43,6 +42,7 @@
Patch2: quilt-support-vimdiff.patch
Patch3: patch-wrapper-rpm.diff
Patch4: suse-workaround-pseudo-release.patch
+Patch5: mail-fix-patch-set-threading.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -65,6 +65,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ mail-fix-patch-set-threading.patch ++
From: Jean Delvare
Date: Fri, 14 Apr 2017 09:07:51 +0200
Subject: mail: Fix patch set threading
Git-commit: 360b85e1f6b6d1aff5ada942fcee816e1ad7a13c
Patch-mainline: yes
Let patches reference the introduction message so that the patch set
is properly threaded by MUA. This used to work but was broken by
accident.
This fixes bug #50775:
https://savannah.nongnu.org/bugs/index.php?50775
Signed-off-by: Jean Delvare
Fixes: 1d659bebaf3d ("quilt/mail: Remove procmail dependency")
Tested-by: Okash Khawaja
Acked-by: Kent R. Spillner
diff --git a/quilt/mail.in b/quilt/mail.in
index 046b502..80fabe8 100644
--- a/quilt/mail.in
+++ b/quilt/mail.in
@@ -95,7 +95,7 @@ extract_header_value()
# Long Header Fields may span multiple lines, in which case CRLF
# is followed by space or tab (RFC 2822)
- sed -n "/^${header}/,/^[^[:blank:]]/ { /^${header}/ { s/^${header}//p;
n; }; /^[^[:blank:]]/q; /^$/q; p; }"
+ sed -ne "/^${header}/I,/^[^[:blank:]]/ { /^${header}/I {
s/^${header}//I; p; n; }; /^[^[:blank:]]/q; /^$/q; p; }"
}
# See RFC 2822 Internet Message Format for how the In-Reply-To and
++ patch-wrapper-rpm.diff ++
--- /var/tmp/diff_new_pack.OGAnNW/_old 2017-04-28 09:11:10.128142052 +0200
+++ /var/tmp/diff_new_pack.OGAnNW/_new 2017-04-28 09:11:10.132141488 +0200
@@ -1,3 +1,13 @@
+From: Andreas Gruenbacher
+Date: Thu, 1 Dec 2016 11:15:48 +0100
+Subject: patch-wrapper: Make the patch names that quilt shows more convenient
+Git-commit: 1cde19389bc5805da713361ac32869388e42f592
+Patch-mainline: yes
+
+When operating on an rpm package, create links to the rpm sources and
+build directories and make patch names relative to these links. This is
+more convenient than using ugly absolute paths.
+
--- a/bin/patch-wrapper.in
+++ b/bin/patch-wrapper.in
@@ -28,7 +28,7 @@ fi
commit quilt for openSUSE:Factory
Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2016-11-11 14:32:15 Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) Package is "quilt" Changes: --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2016-10-04 15:46:13.0 +0200 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2016-11-11 14:32:17.0 +0100 @@ -1,0 +2,42 @@ +Thu Nov 10 10:34:09 CET 2016 - jdelv...@suse.de + +- Update to version 0.65: + * Project settings have priority + * Fix a race condition in diff_file + * Performance: Optimizations to the setup command + * Performance: Optimizations to the bash completion script + * Test suite: Improve the edit test case + * Test suite: Test backup failure + * Test suite: Test the header command with hard links + * diff: Report diff failures + * mail: Fix the help text + * push: Fix the synopsis + * refresh: Do not remove symlinks + * refresh: Break links to read-only patch files + * refresh: Always preserve modification time + * setup: Report failed look-ups in inspect-wrapper + * quilt.el: Fix quilt-editable when patches are stored in subdirs + * bash_completion: Handle spaces in file names + * bash_completion: Update the list of commands + * bash_completion: Add new command options + * bash_completion: Fix handling of mail, new, push options + * guards: Simplify the help text + * guards: Include the file name also in the "Not found" case + * guards: Add support for an external filelist in --check mode + * guards: Report which config file has problem in --check mode + * guards: Documentation update + * guards: Clarify a user message + * Obsoletes edit-01-test-file-creation.patch + * Obsoletes edit-02-call-remove-not-revert.patch + * Obsoletes edit-03-fix-corner-case.patch + * Obsoletes translation-fixes-01.patch + * Obsoletes translation-fixes-02.patch + * Obsoletes translation-fixes-03.patch + * Obsoletes translation-fixes-04.patch + * Obsoletes reject-binary-files-in-patches.patch +- Pass --sysconfdir to configure so that the configuration files + are installed in the right place. +- Update package description. +- Refresh suse-workaround-pseudo-release.patch + +--- @@ -42,35 +84,35 @@ - o Performance: Several optimizations - o Test suite: Several fixes and coverage improvements - o Test suite: Run the tests in predictable order - o files: Add support for unapplied patches - o graph: Check for graphviz availability - o mail: Remove procmail dependency - o push: Do not use interactive mode with -f - o Obsoletes dont-substitute-release.patch - o Obsoletes hackweek-11-01-comment-update.patch - o Obsoletes hackweek-11-02-cleanups.patch - o Obsoletes hackweek-11-03-inspect-list-all-options.patch - o Obsoletes hackweek-11-04-pass-through.patch - o Obsoletes hackweek-11-05-no-explicit-rm.patch - o Obsoletes hackweek-11-06-exclude-from-md5sums.patch - o Obsoletes hackweek-11-07-normalize-path.patch - o Obsoletes hackweek-11-08-inspect-split-wrapper-script.patch - o Obsoletes hackweek-11-09-inspect-temporary-data-file.patch - o Obsoletes hackweek-11-10-setup-fix-path-to-extra-patches.patch - o Obsoletes hackweek-11-11-setup-trace-call-first.patch - o Obsoletes hackweek-11-12-setup-alternative-implementation-v2.patch - o Obsoletes hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch - o Obsoletes hackweek-11-14-setup-fix-link-creation.patch - o Obsoletes hackweek-11-15-setup-missing-escape-in-normalize_path.patch - o Obsoletes hackweek-11-16-setup-fix-create_symlink-corner-case.patch - o Obsoletes inspect-skip-version-check.patch - o Obsoletes pop-add-auto-refresh.patch - o Obsoletes push-add-auto-refresh.patch - o Obsoletes quilt-check-modified-series-rearm.patch - o Obsoletes quilt-check-modified-series.patch - o Obsoletes quilt-el-fix-patch-select-completion.patch - o Obsoletes quilt-el-fix-tramp-support.patch - o Obsoletes quilt-format-options-pass-through.patch - o Obsoletes setup-check-for-rpmbuild.patch - o Obsoletes setup-fix-tar-with-long-options.patch - o Obsoletes setup-skip-version-check.patch + * Performance: Several optimizations + * Test suite: Several fixes and coverage improvements + * Test suite: Run the tests in predictable order + * files: Add support for unapplied patches + * graph: Check for graphviz availability + * mail: Remove procmail dependency + * push: Do not use interactive mode with -f + * Obsoletes dont-substitute-release.patch + * Obsoletes hackweek-11-01-comment-update.patch + * Obsoletes hackweek-11-02-cleanups.patch + * Obsoletes hackweek-11-03-inspect-list-all-options.patch + * Obsoletes hackweek-11-04-pass-through.patch + * Obsoletes
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2016-10-04 15:46:35
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is "quilt"
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2016-09-21
18:24:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2016-10-04
15:46:13.0 +0200
@@ -1,0 +2,10 @@
+Fri Sep 16 09:24:13 UTC 2016 - jdelv...@suse.de
+
+- reject-binary-files-in-patches.patch: Since diffutils version
+ 3.4, diff no longer returns an error code for binary files. Parse
+ the first line of the output to detect this case and raise our
+ own error.
+- Remove fix-faildiff-test-for-diffutils-3.4.patch, use the
+ upstream fix instead.
+
+---
Old:
fix-faildiff-test-for-diffutils-3.4.patch
New:
reject-binary-files-in-patches.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.zPrvlO/_old 2016-10-04 15:46:15.0 +0200
+++ /var/tmp/diff_new_pack.zPrvlO/_new 2016-10-04 15:46:15.0 +0200
@@ -50,7 +50,7 @@
Patch9: edit-01-test-file-creation.patch
Patch10:edit-02-call-remove-not-revert.patch
Patch11:edit-03-fix-corner-case.patch
-Patch12:fix-faildiff-test-for-diffutils-3.4.patch
+Patch12:reject-binary-files-in-patches.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
++ reject-binary-files-in-patches.patch ++
From: Jean Delvare
Date: Thu, 15 Sep 2016 14:05:29 +0200
Subject: Reject binary files in patches
Git-commit: 20f06212baced666027131555ad4c834d8e4b232
Patch-mainline: yes
Since diffutils version 3.4, diff no longer returns an error code for
binary files. Parse the first line of the output to detect this case
and raise our own error.
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index 521e92d18b53..a496f3b07390 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -741,6 +741,12 @@ diff_file()
"$old_file" "$new_file" \
| if read line
then
+ if [[ "$line" =~ ^Binary\ files\ .*\ differ$ ]]
+ then
+ echo "$line"
+ return 1
+ fi
+
if [ -z "$QUILT_NO_DIFF_INDEX" ]
then
echo "Index: $index"
@@ -751,7 +757,7 @@ diff_file()
fi
# Test the return value of diff, and propagate the error retcode if any
- if [ ${PIPESTATUS[0]} == 2 ]
+ if [ ${PIPESTATUS[0]} == 2 -o ${PIPESTATUS[1]} == 1 ]
then
return 1
fi
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2016-09-21 18:24:24
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is "quilt"
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2015-02-27
11:06:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2016-09-21
18:24:26.0 +0200
@@ -1,0 +2,7 @@
+Fri Sep 9 11:05:04 CEST 2016 - jdelv...@suse.de
+
+- fix-faildiff-test-for-diffutils-3.4.patch: Since diffutils
+ version 3.4, diff no longer returns an error code for binary
+ files. Remove this test from faildiff.test.
+
+---
New:
fix-faildiff-test-for-diffutils-3.4.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.mcZnwD/_old 2016-09-21 18:24:28.0 +0200
+++ /var/tmp/diff_new_pack.mcZnwD/_new 2016-09-21 18:24:28.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package quilt
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,6 +50,7 @@
Patch9: edit-01-test-file-creation.patch
Patch10:edit-02-call-remove-not-revert.patch
Patch11:edit-03-fix-corner-case.patch
+Patch12:fix-faildiff-test-for-diffutils-3.4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -82,6 +83,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ fix-faildiff-test-for-diffutils-3.4.patch ++
From: Jean Delvare
Subject: faildiff.test: Fix for diffutils 3.4 and later
Since diffutils version 3.4, diff no longer returns an error code for
binary files. Remove this test from faildiff.test.
Signed-off-by: Jean Delvare
---
test/faildiff.test |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
--- quilt.orig/test/faildiff.test 2016-09-09 10:16:05.709530299 +0200
+++ quilt/test/faildiff.test2016-09-09 10:39:16.914180640 +0200
@@ -29,10 +29,5 @@ What happens on binary files?
$ printf "\\003\\000\\001" > test.bin
$ quilt diff -pab --no-index
>~ (Files|Binary files) a/test\.bin and b/test\.bin differ
- $ echo %{?}
- > 1
-
- $ quilt refresh
- > Diff failed on file 'test.bin', aborting
- $ echo %{?}
- > 1
+ # Since diffutils version 3.4, diff no longer returns an error
+ # code for binary files, so we don't test it here.
commit quilt for openSUSE:Factory
Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2015-02-27 11:06:35 Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) Package is quilt Changes: --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2015-02-13 08:34:00.0 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2015-02-27 11:06:36.0 +0100 @@ -1,0 +2,61 @@ +Mon Feb 16 17:22:51 CET 2015 - jdelv...@suse.de + +Translation fixes: +- translation-fixes-01.patch: Make gettext happy (needed so that + following patches apply cleanly.) +- translation-fixes-02.patch: Missing escape in Japanese + translation. +- translation-fixes-03.patch: Improve the German translation + (including a number of important fixes.) +- translation-fixes-04.patch: Fix translation of main usage message + (all languages.) + +Fixes to the edit command: +- edit-01-test-file-creation.patch: edit: Improve the test case + (needed so that following patches apply cleanly.) +- edit-02-call-remove-not-revert.patch: edit: Use command remove + to remove files. +- edit-03-fix-corner-case.patch: edit: Fix a corner case. + +--- +Mon Feb 16 15:43:04 CET 2015 - jdelv...@suse.de + +- Update to version 0.64: + o Performance: Several optimizations + o Test suite: Several fixes and coverage improvements + o Test suite: Run the tests in predictable order + o files: Add support for unapplied patches + o graph: Check for graphviz availability + o mail: Remove procmail dependency + o push: Do not use interactive mode with -f + o Obsoletes dont-substitute-release.patch + o Obsoletes hackweek-11-01-comment-update.patch + o Obsoletes hackweek-11-02-cleanups.patch + o Obsoletes hackweek-11-03-inspect-list-all-options.patch + o Obsoletes hackweek-11-04-pass-through.patch + o Obsoletes hackweek-11-05-no-explicit-rm.patch + o Obsoletes hackweek-11-06-exclude-from-md5sums.patch + o Obsoletes hackweek-11-07-normalize-path.patch + o Obsoletes hackweek-11-08-inspect-split-wrapper-script.patch + o Obsoletes hackweek-11-09-inspect-temporary-data-file.patch + o Obsoletes hackweek-11-10-setup-fix-path-to-extra-patches.patch + o Obsoletes hackweek-11-11-setup-trace-call-first.patch + o Obsoletes hackweek-11-12-setup-alternative-implementation-v2.patch + o Obsoletes hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch + o Obsoletes hackweek-11-14-setup-fix-link-creation.patch + o Obsoletes hackweek-11-15-setup-missing-escape-in-normalize_path.patch + o Obsoletes hackweek-11-16-setup-fix-create_symlink-corner-case.patch + o Obsoletes inspect-skip-version-check.patch + o Obsoletes pop-add-auto-refresh.patch + o Obsoletes push-add-auto-refresh.patch + o Obsoletes quilt-check-modified-series-rearm.patch + o Obsoletes quilt-check-modified-series.patch + o Obsoletes quilt-el-fix-patch-select-completion.patch + o Obsoletes quilt-el-fix-tramp-support.patch + o Obsoletes quilt-format-options-pass-through.patch + o Obsoletes setup-check-for-rpmbuild.patch + o Obsoletes setup-fix-tar-with-long-options.patch + o Obsoletes setup-skip-version-check.patch +- Refresh suse-workaround-pseudo-release.patch + +--- Old: dont-substitute-release.patch hackweek-11-01-comment-update.patch hackweek-11-02-cleanups.patch hackweek-11-03-inspect-list-all-options.patch hackweek-11-04-pass-through.patch hackweek-11-05-no-explicit-rm.patch hackweek-11-06-exclude-from-md5sums.patch hackweek-11-07-normalize-path.patch hackweek-11-08-inspect-split-wrapper-script.patch hackweek-11-09-inspect-temporary-data-file.patch hackweek-11-10-setup-fix-path-to-extra-patches.patch hackweek-11-11-setup-trace-call-first.patch hackweek-11-12-setup-alternative-implementation-v2.patch hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch hackweek-11-14-setup-fix-link-creation.patch hackweek-11-15-setup-missing-escape-in-normalize_path.patch hackweek-11-16-setup-fix-create_symlink-corner-case.patch inspect-skip-version-check.patch pop-add-auto-refresh.patch push-add-auto-refresh.patch quilt-0.63.tar.bz2 quilt-check-modified-series-rearm.patch quilt-check-modified-series.patch quilt-el-fix-patch-select-completion.patch quilt-el-fix-tramp-support.patch quilt-format-options-pass-through.patch setup-check-for-rpmbuild.patch setup-fix-tar-with-long-options.patch setup-skip-version-check.patch New: edit-01-test-file-creation.patch edit-02-call-remove-not-revert.patch edit-03-fix-corner-case.patch quilt-0.64.tar.bz2 translation-fixes-01.patch translation-fixes-02.patch translation-fixes-03.patch translation-fixes-04.patch
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2015-02-13 08:33:58
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2015-01-30
23:57:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2015-02-13
08:34:00.0 +0100
@@ -1,0 +2,9 @@
+Wed Feb 4 08:52:03 CET 2015 - jdelv...@suse.de
+
+- dont-substitute-release.patch: Update upstream reference.
+- hackweek-11-15-setup-missing-escape-in-normalize_path.patch:
+ setup: Fix removal of . components in normalize_path.
+- hackweek-11-16-setup-fix-create_symlink-corner-case.patch: setup:
+ Fix a corner case in create_symlink (boo#916007).
+
+---
New:
hackweek-11-15-setup-missing-escape-in-normalize_path.patch
hackweek-11-16-setup-fix-create_symlink-corner-case.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.6ioSd3/_old 2015-02-13 08:34:01.0 +0100
+++ /var/tmp/diff_new_pack.6ioSd3/_new 2015-02-13 08:34:01.0 +0100
@@ -69,6 +69,8 @@
Patch72:hackweek-11-12-setup-alternative-implementation-v2.patch
Patch73:hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch
Patch74:hackweek-11-14-setup-fix-link-creation.patch
+Patch75:hackweek-11-15-setup-missing-escape-in-normalize_path.patch
+Patch76:hackweek-11-16-setup-fix-create_symlink-corner-case.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -120,6 +122,8 @@
%patch72 -p1
%patch73 -p1
%patch74 -p1
+%patch75 -p1
+%patch76 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ dont-substitute-release.patch ++
--- /var/tmp/diff_new_pack.6ioSd3/_old 2015-02-13 08:34:01.0 +0100
+++ /var/tmp/diff_new_pack.6ioSd3/_new 2015-02-13 08:34:01.0 +0100
@@ -1,6 +1,6 @@
From: Jean Delvare jdelv...@suse.de
Subject: mail: Don't include the release number in User-Agent
-Upstream: Submitted (2015-01-26)
+Upstream: Committed (2c8ddc751606ad7c36381269af1f64b4c62ba44c)
@RELEASE@ is replaced with the package-level release number in two
places: the spec file, where it is legitimate, and the mail command's
++ hackweek-11-15-setup-missing-escape-in-normalize_path.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: setup: Fix removal of . components in normalize_path
Upstream: Submitted (2015-02-03)
The code was broken in 3 ways:
* I forgot to escape the . so it would match any character.
* The g flag is not enough to catch consecutive . components,
because pattern matches can't overlap.
* A trailing . component would not be removed.
This fixes commit 3fd706a50b7dbb4f8db6e5db014729db51e6beb0
(setup: Let normalize_path deal with ..)
---
quilt/setup.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/quilt/setup.in
+++ b/quilt/setup.in
@@ -75,7 +75,7 @@ check_for_existing_files()
normalize_path()
{
echo $1 | sed -r -e 's://:/:g' \
- -e 's:/./:/:g' \
+ -e 's:/\.(/\.)*(/|$):\2:g' \
-e ':again' \
-e 's:/[^/]+/\.\.(/|$):\1:g' \
-e 'tagain'
++ hackweek-11-16-setup-fix-create_symlink-corner-case.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: setup: Fix a corner case in create_symlink
Upstream: Submitted (2015-02-03)
References: boo#916007
When a link's target is the directory it lives in, create_symlink
would erroneously link to ... Fix the code to properly link to .
instead.
Credits to Robert Milasan for spotting the bug.
---
quilt/setup.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/quilt/setup.in
+++ b/quilt/setup.in
@@ -97,7 +97,7 @@ create_symlink()
do
set -- ${1#*/} ${2#*/}
done
- up=$(echo ${2%/*} | sed -re 's:[^/]+:..:g')
+ up=$(echo $2 | sed -r -e 's:(^|/)[^/]*$::' -e 's:[^/]+:..:g')
set -- ${up:+$up/}$1
set -- ${1%/}
ln -s ${1:-.} $link
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2015-01-30 23:57:30
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-12-17
19:16:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2015-01-30
23:57:31.0 +0100
@@ -1,0 +2,18 @@
+Wed Jan 28 12:15:51 CET 2015 - jdelv...@suse.de
+
+- dont-substitute-release.patch: mail: Don't include the release
+ number in User-Agent.
+
+---
+Wed Jan 28 11:40:19 CET 2015 - jdelv...@suse.de
+
+- Update upstream references.
+- quilt-el-fix-tramp-support.patch: quilt-el: Fix tramp support.
+- quilt-el-fix-patch-select-completion.patch: quilt-el: Fix patch
+ select completion.
+- hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch:
+ setup: Let normalize_path deal with ..
+- hackweek-11-14-setup-fix-link-creation.patch: setup: Fix link
+ creation.
+
+---
New:
dont-substitute-release.patch
hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch
hackweek-11-14-setup-fix-link-creation.patch
quilt-el-fix-patch-select-completion.patch
quilt-el-fix-tramp-support.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.xwaSUT/_old 2015-01-30 23:57:33.0 +0100
+++ /var/tmp/diff_new_pack.xwaSUT/_new 2015-01-30 23:57:33.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package quilt
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -52,6 +52,9 @@
Patch11:inspect-skip-version-check.patch
Patch12:quilt-check-modified-series.patch
Patch13:quilt-check-modified-series-rearm.patch
+Patch14:quilt-el-fix-tramp-support.patch
+Patch15:quilt-el-fix-patch-select-completion.patch
+Patch16:dont-substitute-release.patch
Patch61:hackweek-11-01-comment-update.patch
Patch62:hackweek-11-02-cleanups.patch
Patch63:hackweek-11-03-inspect-list-all-options.patch
@@ -64,6 +67,8 @@
Patch70:hackweek-11-10-setup-fix-path-to-extra-patches.patch
Patch71:hackweek-11-11-setup-trace-call-first.patch
Patch72:hackweek-11-12-setup-alternative-implementation-v2.patch
+Patch73:hackweek-11-13-setup-let-normalize_path-deal-with-dot.patch
+Patch74:hackweek-11-14-setup-fix-link-creation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%if 0%{?suse_version}
@@ -98,6 +103,9 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
%patch61 -p1
%patch62 -p1
%patch63 -p1
@@ -110,6 +118,8 @@
%patch70 -p1
%patch71 -p1
%patch72 -p1
+%patch73 -p1
+%patch74 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
@@ -127,7 +137,7 @@
--with-patch-wrapper \
--with-patch=/usr/bin/patch \
--with-rpmbuild=/usr/lib/rpm/rpmb
-make %{?_smp_mflags} RELEASE=%{release}
+make %{?_smp_mflags}
# Compile quilt.el for faster emacs startup (bnc#617673)
pushd lib
emacs -batch -q --no-site -f batch-byte-compile quilt.el
++ dont-substitute-release.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: mail: Don't include the release number in User-Agent
Upstream: Submitted (2015-01-26)
@RELEASE@ is replaced with the package-level release number in two
places: the spec file, where it is legitimate, and the mail command's
User-Agent string, where I think it is not. The package release
number should not affect the contents of the package, otherwise it
makes it difficult to compare build results.
I have checked other MUA (Mutt, Thunderbird, Claws Mail) and they all
only include the version, not the release number in their User-Agent
string.
Drop the @RELEASE@ replacement rule to make sure we don't use it
accidentally anywhere in the future. The spec file has its own build
rule so it is not affected.
---
Makefile.in |1 -
quilt/mail.in |2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,7 +264,6 @@ $(patsubst %.in,%,$(wildcard bin/*.in qu
-e 's:@PATCH''@:$(PATCH):g' \
-e 's:@STAT_HARDLINK''@:$(STAT_HARDLINK):g' \
-e 's:@VERSION''@:$(VERSION):g' \
- -e
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2014-12-17 19:17:58
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-10-31
18:27:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-12-17
19:16:56.0 +0100
@@ -1,0 +2,45 @@
+Mon Dec 8 10:39:42 CET 2014 - jdelv...@suse.de
+
+- Update upstream references.
+- hackweek-11-11-setup-alternative-implementation.patch: Delete,
+ replaced with new implementation.
+- hackweek-11-11-setup-trace-call-first.patch: inspect-wrapper:
+ Trace calls earlier.
+- hackweek-11-12-setup-alternative-implementation-v2.patch: New
+ implementation of setup --fast option.
+
+---
+Tue Nov 4 13:30:30 CET 2014 - jdelv...@suse.de
+
+- quilt.spec: Only use Recommends for SUSE targets, as it was not
+ supported upstream until very recently so it breaks the build
+ on Fedora_18, RHEL_6 and CentOS_6.
+
+---
+Mon Nov 3 14:09:31 CET 2014 - jdelv...@suse.de
+
+- quilt-check-modified-series.patch: Add upstream reference.
+- quilt-check-modified-series-rearm.patch: pop: Rearm consistency
+ check if needed.
+- hackweek-11-01-comment-update.patch: inspect: Comment update.
+- hackweek-11-02-cleanups.patch: setup/inspect: Cleanups.
+- hackweek-11-03-inspect-list-all-options.patch: inspect: List all
+ options in usage text.
+- hackweek-11-04-pass-through.patch: inspect: Pass through the
+ wrappers when appropriate.
+- hackweek-11-05-no-explicit-rm.patch: inspect: Don't explicitly
+ delete the temporary data file.
+- hackweek-11-06-exclude-from-md5sums.patch: inspect: Exclude more
+ files from md5sums.
+- hackweek-11-07-normalize-path.patch: setup: Introduce function
+ normalize_path.
+- hackweek-11-08-inspect-split-wrapper-script.patch: inspect: Split
+ the patch/tar/unzip wrapper to a separate script.
+- hackweek-11-09-inspect-temporary-data-file.patch:
+ inspect-wrapper: Minor code optimization.
+- hackweek-11-10-setup-fix-path-to-extra-patches.patch: setup: Fix
+ path to extra patches in series file.
+- hackweek-11-11-setup-alternative-implementation.patch: setup: Add
+ --fast option.
+
+---
New:
hackweek-11-01-comment-update.patch
hackweek-11-02-cleanups.patch
hackweek-11-03-inspect-list-all-options.patch
hackweek-11-04-pass-through.patch
hackweek-11-05-no-explicit-rm.patch
hackweek-11-06-exclude-from-md5sums.patch
hackweek-11-07-normalize-path.patch
hackweek-11-08-inspect-split-wrapper-script.patch
hackweek-11-09-inspect-temporary-data-file.patch
hackweek-11-10-setup-fix-path-to-extra-patches.patch
hackweek-11-11-setup-trace-call-first.patch
hackweek-11-12-setup-alternative-implementation-v2.patch
quilt-check-modified-series-rearm.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.BKMoKu/_old 2014-12-17 19:16:57.0 +0100
+++ /var/tmp/diff_new_pack.BKMoKu/_new 2014-12-17 19:16:57.0 +0100
@@ -51,11 +51,26 @@
Patch10:push-add-auto-refresh.patch
Patch11:inspect-skip-version-check.patch
Patch12:quilt-check-modified-series.patch
+Patch13:quilt-check-modified-series-rearm.patch
+Patch61:hackweek-11-01-comment-update.patch
+Patch62:hackweek-11-02-cleanups.patch
+Patch63:hackweek-11-03-inspect-list-all-options.patch
+Patch64:hackweek-11-04-pass-through.patch
+Patch65:hackweek-11-05-no-explicit-rm.patch
+Patch66:hackweek-11-06-exclude-from-md5sums.patch
+Patch67:hackweek-11-07-normalize-path.patch
+Patch68:hackweek-11-08-inspect-split-wrapper-script.patch
+Patch69:hackweek-11-09-inspect-temporary-data-file.patch
+Patch70:hackweek-11-10-setup-fix-path-to-extra-patches.patch
+Patch71:hackweek-11-11-setup-trace-call-first.patch
+Patch72:hackweek-11-12-setup-alternative-implementation-v2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+%if 0%{?suse_version}
Recommends: procmail
Recommends: bzip2
Recommends: /usr/bin/rpmbuild
+%endif
%if 0%{?suse_version} 1120
Recommends: xz
%endif
@@ -82,6 +97,19 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
+%patch67 -p1
+%patch68 -p1
+%patch69 -p1
+%patch70 -p1
+%patch71 -p1
+%patch72 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
@@
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2014-10-31 18:27:05
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-10-11
19:25:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-10-31
18:27:07.0 +0100
@@ -1,0 +2,15 @@
+Tue Oct 14 13:07:53 CEST 2014 - jdelv...@suse.de
+
+- quilt-check-modified-series.patch: Check for series file
+ consistency.
+- setup-fix-tar-with-long-options.patch,
+ inspect-skip-version-check.patch: Update upstream status.
+
+---
+Thu Oct 9 15:00:35 CEST 2014 - jdelv...@suse.de
+
+- inspect-skip-version-check.patch: Skip version check when
+ running quilt setup on a spec file. The previous fix only
+ worked when running quilt setup on a series file.
+
+---
New:
inspect-skip-version-check.patch
quilt-check-modified-series.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.zqlETh/_old 2014-10-31 18:27:08.0 +0100
+++ /var/tmp/diff_new_pack.zqlETh/_new 2014-10-31 18:27:08.0 +0100
@@ -49,6 +49,8 @@
Patch8: quilt-format-options-pass-through.patch
Patch9: pop-add-auto-refresh.patch
Patch10:push-add-auto-refresh.patch
+Patch11:inspect-skip-version-check.patch
+Patch12:quilt-check-modified-series.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: procmail
@@ -78,6 +80,8 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
+%patch12 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ inspect-skip-version-check.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: inspect: Skip version check
Upstream: Committed (6a5fcdc24dc47419da4cd688fe7fbfa189c91976)
Commit a626fcf8b95f2ff51701a00d65043b9f65207514 (setup: Skip version
check) is insufficient for spec file-based setup commands. inspect
itself also sources patchfns, so it must also skip the version check
explicitly.
---
quilt/scripts/inspect.in |3 +++
1 file changed, 3 insertions(+)
--- a/quilt/scripts/inspect.in
+++ b/quilt/scripts/inspect.in
@@ -8,6 +8,9 @@
: ${QUILT_DIR=@QUILT_DIR@}
+# Version check is irrelevant to this script.
+skip_version_check=1
+
if ! [ -r $QUILT_DIR/scripts/patchfns ]
then
echo Cannot read library $QUILT_DIR/scripts/patchfns 2
++ quilt-check-modified-series.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: Check for series file consistency
Upstream: Submitted (2014-10-14)
Quilt allows manual changes to the series file to some degree. For
example, adding comments or reordering patches in the unapplied
section of the series file is OK. However, changing the order of
applied patches breaks a number of assumptions and can cause quilt to
produce unexpected or confusing results.
For example, starting from this:
+ patches/01.patch
= patches/02.patch
patches/03.patch
patches/04.patch
and moving the last patch at the beginning of the series file,
quilt series -v will print:
+ patches/04.patch
+ patches/01.patch
= patches/02.patch
patches/03.patch
That is, it will claim that 04.patch is applied, while it it not.
Likewise, 04.patch would be listed by neither quilt applied nor
quilt unapplied.
While addressing all such cases would certainly be possible, that
would require a significant amount of work, and would come with
performance penalties. It would also be difficult to be certain that
all issues have been found and addressed. So it seems more reasonable
to simply spot such manual changes to the series file and ask the user
to pop all patches to start from a clean state as needed.
---
quilt/scripts/patchfns.in | 35 ---
test/altered-series.test | 44
2 files changed, 76 insertions(+), 3 deletions(-)
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -948,6 +948,24 @@ version_check()
return 1
}
+consistency_check()
+{
+ local top applied patches
+
+ top=$(top_patch)
+ applied=$(applied_before $top)
+ patches=$(patches_before $top)
+
+ if [ $applied != $patches ]
+ then
+ return 1
+ else
+ # Skip check until series file is modified again
+ touch $DB
+ return 0
+ fi
+}
+
print_patch()
{
echo ${QUILT_PATCHES_PREFIX:+$SUBDIR_DOWN$QUILT_PATCHES/}$1
@@ -1094,10 +1112,21 @@ fi
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2014-10-11 19:25:52
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-08-13
08:49:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-10-11
19:25:56.0 +0200
@@ -1,0 +2,10 @@
+Wed Oct 1 14:10:22 CEST 2014 - jdelv...@suse.de
+
+- setup-fix-tar-with-long-options.patch: Update to new upstream
+ version. This fixes handling of corner cases.
+- quilt-format-options-pass-through.patch,
+ pop-add-auto-refresh.patch, push-add-auto-refresh.patch:
+ Implement auto-refreshing when applying or unapplying patches, as
+ suggested by Tomas Cech and Takashi Iwai.
+
+---
New:
pop-add-auto-refresh.patch
push-add-auto-refresh.patch
quilt-format-options-pass-through.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.PQyfmf/_old 2014-10-11 19:25:56.0 +0200
+++ /var/tmp/diff_new_pack.PQyfmf/_new 2014-10-11 19:25:56.0 +0200
@@ -46,6 +46,9 @@
Patch5: setup-skip-version-check.patch
Patch6: setup-check-for-rpmbuild.patch
Patch7: setup-fix-tar-with-long-options.patch
+Patch8: quilt-format-options-pass-through.patch
+Patch9: pop-add-auto-refresh.patch
+Patch10:push-add-auto-refresh.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: procmail
@@ -72,6 +75,9 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ pop-add-auto-refresh.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: pop: Add --refresh option
Upstream: Submitted (2014-10-01)
Add an option to automatically refresh each patch before it gets
unapplied.
---
quilt/pop.in | 11 +--
test/auto-refresh.test | 27 +++
2 files changed, 36 insertions(+), 2 deletions(-)
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -19,7 +19,7 @@ fi
usage()
{
- printf $Usage: quilt pop [-afRqv] [num|patch]\n
+ printf $Usage: quilt pop [-afRqv] [--refresh] [num|patch]\n
if [ x$1 = x-h ]
then
printf $
@@ -41,6 +41,9 @@ completion can be used.
-q Quiet operation.
-v Verbose operation.
+
+--refresh
+ Automatically refresh every patch before it gets unapplied.
exit 0
else
@@ -163,7 +166,7 @@ remove_patch()
return $status
}
-options=`getopt -o fRqvah -- $@`
+options=`getopt -o fRqvah --long refresh -- $@`
if [ $? -ne 0 ]
then
@@ -194,6 +197,9 @@ do
shift ;;
-h)
usage -h ;;
+ --refresh)
+ opt_refresh=1
+ shift ;;
--)
shift
break ;;
@@ -239,6 +245,7 @@ fi
for patch in $patches
do
+ [ -z $opt_refresh ] || quilt_command refresh $QUILT_REFRESH_ARGS
if ! remove_patch $patch
then
exit 1
--- /dev/null
+++ b/test/auto-refresh.test
@@ -0,0 +1,27 @@
+$ mkdir patches
+
+$ echo a a
+$ echo b b
+
+$ quilt new a.patch
+ Patch patches/a.patch is now on top
+$ quilt add a
+ File a added to patch patches/a.patch
+$ echo A a
+
+$ quilt new b.patch
+ Patch patches/b.patch is now on top
+$ quilt add b
+ File b added to patch patches/b.patch
+$ echo B b
+
+$ quilt pop -a --refresh
+ Refreshed patch patches/b.patch
+ Removing patch patches/b.patch
+ Restoring b
+
+ Refreshed patch patches/a.patch
+ Removing patch patches/a.patch
+ Restoring a
+
+ No patches applied
++ push-add-auto-refresh.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: push: Add --refresh option
Upstream: Submitted (2014-10-01)
Add an option to automatically refresh each patch after is was
successfully applied.
---
quilt/push.in | 11 +--
test/auto-refresh.test | 22 ++
2 files changed, 31 insertions(+), 2 deletions(-)
--- a/quilt/push.in
+++ b/quilt/push.in
@@ -21,7 +21,7 @@ setup_colors
usage()
{
- printf $Usage: quilt push [-afqv] [--merge[=merge|diff3]]
[--leave-rejects] [--color[=always|auto|never]] [num|patch]\n
+ printf $Usage: quilt push [-afqv] [--merge[=merge|diff3]]
[--leave-rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\n
if [ x$1 = x-h ]
then
printf $
@@ -53,6 +53,9 @@ be used.
--color[=always|auto|never]
Use syntax coloring (auto activates it only if the output is a tty).
+
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2014-08-13 08:48:58
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-06-19
13:08:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-08-13
08:49:05.0 +0200
@@ -1,0 +2,7 @@
+Thu Jul 31 18:47:10 CEST 2014 - jdelv...@suse.de
+
+- setup-skip-version-check.patch: setup: Skip version check.
+- setup-fix-tar-with-long-options.patch: inspect: Handle long
+ options passed to tar.
+
+---
New:
setup-fix-tar-with-long-options.patch
setup-skip-version-check.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.UqEqoX/_old 2014-08-13 08:49:07.0 +0200
+++ /var/tmp/diff_new_pack.UqEqoX/_new 2014-08-13 08:49:07.0 +0200
@@ -42,8 +42,10 @@
Patch1: expand.diff
Patch2: quilt-support-vimdiff.patch
Patch3: patch-wrapper-rpm.diff
-Patch4: setup-check-for-rpmbuild.patch
-Patch5: suse-workaround-pseudo-release.patch
+Patch4: suse-workaround-pseudo-release.patch
+Patch5: setup-skip-version-check.patch
+Patch6: setup-check-for-rpmbuild.patch
+Patch7: setup-fix-tar-with-long-options.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: procmail
@@ -68,6 +70,8 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ setup-check-for-rpmbuild.patch ++
--- /var/tmp/diff_new_pack.UqEqoX/_old 2014-08-13 08:49:07.0 +0200
+++ /var/tmp/diff_new_pack.UqEqoX/_new 2014-08-13 08:49:07.0 +0200
@@ -11,7 +11,7 @@
--- a/quilt/setup.in
+++ b/quilt/setup.in
-@@ -167,6 +167,14 @@ case $1 in
+@@ -173,6 +173,14 @@ case $1 in
*.spec)
spec_file=$1
++ setup-fix-tar-with-long-options.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: inspect: Handle long options passed to tar
Upstream: Submitted
The command line interface to tar is complex and sometimes confusing,
but we should still do our best to figure where the file name is on
that command line.
Add support for the --file FILE and --file=FILE options. Other long
options must be explicitly skipped, as well as short options not
containing the letter f.
With this we should be good to go in most real-world cases, but
there are still a few corner cases we may not handle properly. These
can be addressed later when reported.
Reported by Petr Tesarik.
---
quilt/scripts/inspect.in | 34 ++
1 file changed, 26 insertions(+), 8 deletions(-)
--- a/quilt/scripts/inspect.in
+++ b/quilt/scripts/inspect.in
@@ -257,14 +257,32 @@ cat -'EOF' $tmpdir/bin/wrapper
tar_input_file()
{
- case $1 in
- *C*f*)
- echo $3
- ;;
- *f*)
- echo $2
- ;;
- esac
+ while [ $# -gt 0 ]; do
+ case $1 in
+ --file)
+ echo $2
+ return
+ ;;
+ --file=*)
+ echo ${1#--file=}
+ return
+ ;;
+ --*)
+ shift
+ ;;
+ *C*f*)
+ echo $3
+ return
+ ;;
+ *f*)
+ echo $2
+ return
+ ;;
+ -*)
+ shift
+ ;;
+ esac
+ done
}
unzip_input_file()
++ setup-skip-version-check.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: setup: Skip version check
Upstream: Committed (a626fcf8b95f2ff51701a00d65043b9f65207514)
The version check is irrelevant when running quilt setup, as it is
creating a brand new working tree anyway.
Reported by Petr Tesarik.
---
diff --git a/quilt/setup.in b/quilt/setup.in
index 36d0d24..a90c5ad 100644
--- a/quilt/setup.in
+++ b/quilt/setup.in
@@ -6,6 +6,9 @@
#
# See the COPYING and AUTHORS files for more details.
+# Version check is irrelevant to this command.
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2014-06-19 13:08:34
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-05-06
14:02:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-06-19
13:08:39.0 +0200
@@ -1,0 +2,33 @@
+Mon Jun 9 15:46:01 CEST 2014 - jdelv...@suse.de
+
+- Fix setup-check-for-rpmbuild.patch: echo was used where printf
+ was intended (bnc#873817); also update upstream reference
+
+---
+Mon Jun 9 14:45:46 CEST 2014 - jdelv...@suse.de
+
+- update to 0.63
+ o Option -E is no longer passed to patch by default
+ o Return 2 when there is nothing to do, contrasting with errors
+(ret=1)
+ o Exit with an error when diff's retcode=2 (error) on patch
+refresh
+ o bash_completion: cleanups and performance improvement
+(Savannah's #27111)
+ o Add some tests to our testsuite, for a better coverage
+ o Bug fix: Patches emptying files should work now
+ o Bug fix: Check for duplicate patch in series (Savannah's
+#20628)
+ o Obsoletes quilt-bash_completion-fix-completion-of-patch-names.patch
+ o Obsoletes quilt-boost-the-speed-of-series-applied-and-unapplied.patch
+ o Obsoletes quilt-enable-patch-wrapper-test.patch
+ o Obsoletes quilt-files-return-nothing-if-there-are-no-files.patch
+ o Obsoletes quilt-fix-quilt-diff-z-on-files-with-spaces-in-name.patch
+ o Obsoletes
quilt-patches-fix-heuristic-for-unapplied-patches-with-timestamps.patch
+ o Obsoletes quilt-patches-optimize-processing-of-unapplied-patches.patch
+ o Obsoletes quilt-patches-optimize-the-multiple-files-case.patch
+ o Obsoletes quilt-refresh-fix-error-message.patch
+- Refresh patch-wrapper-rpm.diff
+- Refresh quilt-support-vimdiff.patch
+
+---
Old:
quilt-0.61.tar.bz2
quilt-bash_completion-fix-completion-of-patch-names.patch
quilt-boost-the-speed-of-series-applied-and-unapplied.patch
quilt-enable-patch-wrapper-test.patch
quilt-files-return-nothing-if-there-are-no-files.patch
quilt-fix-quilt-diff-z-on-files-with-spaces-in-name.patch
quilt-patches-fix-heuristic-for-unapplied-patches-with-timestamps.patch
quilt-patches-optimize-processing-of-unapplied-patches.patch
quilt-patches-optimize-the-multiple-files-case.patch
quilt-refresh-fix-error-message.patch
New:
quilt-0.63.tar.bz2
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.kFXRoB/_old 2014-06-19 13:08:41.0 +0200
+++ /var/tmp/diff_new_pack.kFXRoB/_new 2014-06-19 13:08:41.0 +0200
@@ -17,7 +17,7 @@
Name: quilt
-Version:0.61
+Version:0.63
Release:0
Summary:A Tool for Working with Many Patches
License:GPL-2.0+
@@ -44,15 +44,6 @@
Patch3: patch-wrapper-rpm.diff
Patch4: setup-check-for-rpmbuild.patch
Patch5: suse-workaround-pseudo-release.patch
-Patch6: quilt-bash_completion-fix-completion-of-patch-names.patch
-Patch7: quilt-refresh-fix-error-message.patch
-Patch8: quilt-fix-quilt-diff-z-on-files-with-spaces-in-name.patch
-Patch9: quilt-files-return-nothing-if-there-are-no-files.patch
-Patch10:quilt-patches-optimize-processing-of-unapplied-patches.patch
-Patch11:quilt-patches-optimize-the-multiple-files-case.patch
-Patch12:quilt-boost-the-speed-of-series-applied-and-unapplied.patch
-Patch13:
quilt-patches-fix-heuristic-for-unapplied-patches-with-timestamps.patch
-Patch14:quilt-enable-patch-wrapper-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: procmail
@@ -77,15 +68,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ patch-wrapper-rpm.diff ++
--- /var/tmp/diff_new_pack.kFXRoB/_old 2014-06-19 13:08:41.0 +0200
+++ /var/tmp/diff_new_pack.kFXRoB/_new 2014-06-19 13:08:41.0 +0200
@@ -1,17 +1,15 @@
-Index: quilt-0.46/bin/patch-wrapper.in
-===
quilt-0.46.orig/bin/patch-wrapper.in
-+++ quilt-0.46/bin/patch-wrapper.in
-@@ -27,7 +27,7 @@ then
- fi
+--- a/bin/patch-wrapper.in
b/bin/patch-wrapper.in
+@@ -28,7 +28,7 @@ fi
- backup_files() {
+ backup_files()
+ {
-declare dir=${QUILT_PC:-.pc}/$patch
+declare
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2014-04-26 06:06:21
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2014-03-25
13:27:51.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-04-26
06:06:22.0 +0200
@@ -1,0 +2,7 @@
+Thu Apr 17 10:49:29 CEST 2014 - jdelv...@suse.de
+
+- setup-check-for-rpmbuild.patch: setup: Check for rpmbuild
+ availability (bnc#873817)
+- Add recommends: rpmbuild (bnc#873817)
+
+---
New:
setup-check-for-rpmbuild.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.NKjGEb/_old 2014-04-26 06:06:22.0 +0200
+++ /var/tmp/diff_new_pack.NKjGEb/_new 2014-04-26 06:06:22.0 +0200
@@ -42,11 +42,13 @@
Patch1: expand.diff
Patch2: quilt-support-vimdiff.patch
Patch3: patch-wrapper-rpm.diff
+Patch4: setup-check-for-rpmbuild.patch
Patch5: suse-workaround-pseudo-release.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: procmail
Recommends: bzip2
+Recommends: /usr/bin/rpmbuild
%if 0%{?suse_version} 1120
Recommends: xz
%endif
@@ -64,6 +66,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%patch5 -p1
%build
++ setup-check-for-rpmbuild.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: setup: Check for rpmbuild availability
References: bnc#873817
Upstream: Not yet submitted
Before running inspect on a spec file, verify that rpmbuild is
available. Print a user-friendly error message if not.
---
quilt/setup.in |8
1 file changed, 8 insertions(+)
--- a/quilt/setup.in
+++ b/quilt/setup.in
@@ -167,6 +167,14 @@ case $1 in
*.spec)
spec_file=$1
+ # check if rpmbuild is installed before running inspect
+ if ! type rpmbuild /dev/null
+ then
+ echo $You have to install '%s' (from package %s) to use 'quilt
%s'\n \
+rpmbuild rpm-build setup 2
+ exit 1
+ fi
+
if ! $QUILT_DIR/scripts/inspect $verbose $opt_sourcedir $opt_fuzz \
$spec_file 21 $tmpfile
then
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit quilt for openSUSE:Factory
Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2014-03-25 13:27:50 Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) Package is quilt Changes: --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2013-12-10 16:03:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2014-03-25 13:27:51.0 +0100 @@ -1,0 +2,5 @@ +Fri Mar 21 09:42:03 CET 2014 - oher...@suse.de + +- quilt requires less, unless PAGER is set + +--- Other differences: -- ++ quilt.spec ++ --- /var/tmp/diff_new_pack.iGOWUG/_old 2014-03-25 13:27:52.0 +0100 +++ /var/tmp/diff_new_pack.iGOWUG/_new 2014-03-25 13:27:52.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package quilt # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,7 @@ Requires: file Requires: findutils Requires: gzip +Requires: less Requires: mktemp Requires: patch Requires: perl -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2013-12-10 16:03:28
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2013-10-01
08:34:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2013-12-10
16:03:30.0 +0100
@@ -1,0 +2,38 @@
+Mon Dec 9 13:36:41 CET 2013 - jdelv...@suse.de
+
+- Recompress the source archive with bzip2 (to remove a rpmlint
+ warning.)
+
+---
+Mon Dec 9 11:20:32 CET 2013 - jdelv...@suse.de
+
+- Change bzip2 from required to recommended. Quilt works just fine
+ without it and xz compression if becoming more popular than
+ bzip2.
+
+---
+Mon Dec 9 10:44:43 CET 2013 - jdelv...@suse.de
+
+- update to 0.61
+ o No new feature, but almost two years of fixes and minor
+improvements.
+ o Many fixes and improvements to quilt.el (emacs integration.)
+ o Many fixes and improvements to the setup command, which we
+already had as patches.
+ o Parameter quoting fixes to many commands.
+ o Several fixes and improvements to remove-trailing-ws, together
+with a dedicated test case.
+ o Various fixes to the pop, push, refresh and patches commands.
+ o Translation fixes and updates.
+ o Obsoletes quilt-find-quoting-style.patch.
+ o Obsoletes quilt-makefile-fix-configure-with-xargs.patch.
+ o Obsoletes quilt-makefile-fix-find-perm-usage.patch.
+ o Obsoletes quilt-setup-01-check-existing-files-after-unpack.patch.
+ o Obsoletes quilt-setup-02-try-alternative-names.patch.
+ o Obsoletes quilt-setup-03-remember-alternative-names.patch.
+ o Obsoletes quilt-setup-04-handle-zip-files.patch.
+ o Obsoletes quilt-setup-05-fix-check_for_existing_files.patch.
+ o Obsoletes quilt-setup-06-check-for-directories-too.patch.
+ o Obsoletes quilt-stable-rebuild.patch.
+
+---
Old:
quilt-0.60.tar.gz
quilt-find-quoting-style.patch
quilt-makefile-fix-configure-with-xargs.patch
quilt-makefile-fix-find-perm-usage.patch
quilt-setup-01-check-existing-files-after-unpack.patch
quilt-setup-02-try-alternative-names.patch
quilt-setup-03-remember-alternative-names.patch
quilt-setup-04-handle-zip-files.patch
quilt-setup-05-fix-check_for_existing_files.patch
quilt-setup-06-check-for-directories-too.patch
quilt-stable-rebuild.patch
New:
quilt-0.61.tar.bz2
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.Le1ZcP/_old 2013-12-10 16:03:30.0 +0100
+++ /var/tmp/diff_new_pack.Le1ZcP/_new 2013-12-10 16:03:30.0 +0100
@@ -17,7 +17,7 @@
Name: quilt
-Version:0.60
+Version:0.61
Release:0
Summary:A Tool for Working with Many Patches
License:GPL-2.0+
@@ -26,7 +26,6 @@
BuildRequires: ed
BuildRequires: emacs-nox
BuildRequires: procmail
-Requires: bzip2
Requires: coreutils
Requires: diffstat
Requires: diffutils
@@ -37,25 +36,16 @@
Requires: patch
Requires: perl
Url:http://savannah.nongnu.org/projects/quilt
-Source:
http://download.savannah.gnu.org/releases/quilt/%{name}-%{version}.tar.gz
+Source: %{name}-%{version}.tar.bz2
Source1:suse-start-quilt-mode.el
Patch1: expand.diff
Patch2: quilt-support-vimdiff.patch
Patch3: patch-wrapper-rpm.diff
Patch5: suse-workaround-pseudo-release.patch
-Patch6: quilt-stable-rebuild.patch
-Patch7: quilt-setup-01-check-existing-files-after-unpack.patch
-Patch8: quilt-setup-02-try-alternative-names.patch
-Patch9: quilt-setup-03-remember-alternative-names.patch
-Patch10:quilt-setup-04-handle-zip-files.patch
-Patch11:quilt-setup-05-fix-check_for_existing_files.patch
-Patch12:quilt-setup-06-check-for-directories-too.patch
-Patch13:quilt-makefile-fix-find-perm-usage.patch
-Patch14:quilt-makefile-fix-configure-with-xargs.patch
-Patch15:quilt-find-quoting-style.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: procmail
+Recommends: bzip2
%if 0%{?suse_version} 1120
Recommends: xz
%endif
@@ -74,16 +64,6 @@
%patch2 -p1
%patch3 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ quilt-0.60.tar.gz -
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2013-10-01 08:34:57
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2013-04-18
10:43:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2013-10-01
08:34:58.0 +0200
@@ -1,0 +2,10 @@
+Mon Sep 30 14:36:03 CEST 2013 - jdelv...@suse.de
+
+- quilt-makefile-fix-find-perm-usage.patch: Makefile: Fix find
+ -perm usage.
+- quilt-makefile-fix-configure-with-xargs.patch: Makefile: Fix
+ support for ./configure --with-xargs.
+- quilt-find-quoting-style.patch: delete.test: Cope with new
+ quoting style in find error message.
+
+---
New:
quilt-find-quoting-style.patch
quilt-makefile-fix-configure-with-xargs.patch
quilt-makefile-fix-find-perm-usage.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.t8GIL9/_old 2013-10-01 08:34:58.0 +0200
+++ /var/tmp/diff_new_pack.t8GIL9/_new 2013-10-01 08:34:58.0 +0200
@@ -50,6 +50,9 @@
Patch10:quilt-setup-04-handle-zip-files.patch
Patch11:quilt-setup-05-fix-check_for_existing_files.patch
Patch12:quilt-setup-06-check-for-directories-too.patch
+Patch13:quilt-makefile-fix-find-perm-usage.patch
+Patch14:quilt-makefile-fix-configure-with-xargs.patch
+Patch15:quilt-find-quoting-style.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Recommends: procmail
@@ -78,6 +81,9 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ quilt-find-quoting-style.patch ++
From: Jean Delvare jdelv...@suse.de
Date: Mon, 30 Sep 2013 12:21:16 +
Subject: delete.test: Cope with new quoting style in find error message
Git-commit: ab6c69664664ec66b097aeba113288f341f34e5d
---
test/delete.test |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/test/delete.test
+++ b/test/delete.test
@@ -77,7 +77,7 @@ Test the delete command.
$ quilt delete test3
Removing patch %{P}test3
- ~ find: `?\./dir'?: Permission denied
+ ~ .*find: [`']?\./dir'?: Permission denied
$ chmod a+rx .pc/test3/dir
++ quilt-makefile-fix-configure-with-xargs.patch ++
From: Jean Delvare jdelv...@suse.de
Date: Mon, 30 Sep 2013 12:22:45 +
Subject: Makefile.in: Fix support for configure --with-xargs
Git-commit: 4e09264d3cbbfc49761a36635f1662b9d38358eb
---
Makefile.in |1 +
1 file changed, 1 insertion(+)
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ TR := @TR@
SED := @SED@
AWK := @AWK@
FIND :=@FIND@
+XARGS := @XARGS@
DIFF :=@DIFF@
PATCH := @PATCH@
MKTEMP := @MKTEMP@
++ quilt-makefile-fix-find-perm-usage.patch ++
From: Jean Delvare jdelv...@suse.de
Date: Fri, 24 May 2013 13:13:55 +
Subject: Makefile: Fix find -perm usage
Git-commit: bc340b709b866f50273d4ef125e1ae3cbc44c6ac
Support for obsolete find -perm +MODE syntax was removed from GNU
findutils by commit
v4.5.10-144-g90f0c5d24153ad3327edd6f2249fc95a5cfb72e0.
Reported by Dmitry V. Levin.
Also -maxdepth is not portable and not needed so drop it.
---
Makefile.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,7 +277,7 @@ Makefile : Makefile.in configure
@echo Please run ./configure
@false
-compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -maxdepth 1
-type f -perm +111))
+compat_leftover := $(filter-out $(COMPAT),$(shell $(FIND) compat -type f -perm
-0100))
.PHONY :: compat
compat :: $(COMPAT)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2013-04-18 10:43:12
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt, Maintainer is jdelv...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2012-10-26
17:30:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2013-04-18
10:43:14.0 +0200
@@ -1,0 +2,6 @@
+Fri Apr 5 12:49:39 UTC 2013 - idon...@suse.com
+
+- Cleanup spec file
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+---
Old:
quilt-0.60.tar.bz2
New:
quilt-0.60.tar.gz
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.21WMEV/_old 2013-04-18 10:43:17.0 +0200
+++ /var/tmp/diff_new_pack.21WMEV/_new 2013-04-18 10:43:17.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package quilt
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,15 @@
Name: quilt
+Version:0.60
+Release:0
+Summary:A Tool for Working with Many Patches
+License:GPL-2.0+
+Group: Productivity/Text/Utilities
BuildRequires: diffstat
BuildRequires: ed
BuildRequires: emacs-nox
BuildRequires: procmail
-Summary:A Tool for Working with Many Patches
-License:GPL-2.0+
-Group: Productivity/Text/Utilities
-Version:0.60
-Release:0
Requires: bzip2
Requires: coreutils
Requires: diffstat
@@ -36,17 +36,11 @@
Requires: mktemp
Requires: patch
Requires: perl
-%if %{suse_version} 910
-Recommends: procmail
-%endif
-%if %{suse_version} 1120
-Recommends: xz
-%endif
-AutoReqProv:off
-Source: %{name}-%{version}.tar.bz2
+Url:http://savannah.nongnu.org/projects/quilt
+Source:
http://download.savannah.gnu.org/releases/quilt/%{name}-%{version}.tar.gz
Source1:suse-start-quilt-mode.el
Patch1: expand.diff
-patch2: quilt-support-vimdiff.patch
+Patch2: quilt-support-vimdiff.patch
Patch3: patch-wrapper-rpm.diff
Patch5: suse-workaround-pseudo-release.patch
Patch6: quilt-stable-rebuild.patch
@@ -56,9 +50,12 @@
Patch10:quilt-setup-04-handle-zip-files.patch
Patch11:quilt-setup-05-fix-check_for_existing_files.patch
Patch12:quilt-setup-06-check-for-directories-too.patch
-Url:http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+Recommends: procmail
+%if 0%{?suse_version} 1120
+Recommends: xz
+%endif
%description
Quilt allows you to easily manage large numbers of patches by keeping
@@ -68,13 +65,6 @@
Quilt originally was based on Andrew Morton's patch scripts found at
http://www.zip.com.au/~akpm/linux/patches/.
-
-
-Authors:
-
-Andreas Gruenbacher agr...@suse.de
-Jean Delvare jdelv...@suse.de
-
%prep
%setup -q
%patch1 -p1
@@ -96,7 +86,7 @@
# /etc/profile to reset the PATH. We must not do that: the
# inspect script needs to pass an additional path component to
# rpmbuild for the tar and patch wrappers.
-CFLAGS=$RPM_OPT_FLAGS \
+CFLAGS=%{optflags} \
./configure --prefix=/usr \
--mandir=%{_mandir} \
--docdir=%{_docdir}/%{name} \
@@ -105,7 +95,7 @@
--with-patch-wrapper \
--with-patch=/usr/bin/patch \
--with-rpmbuild=/usr/lib/rpm/rpmb
-make %{?jobs:-j%jobs} RELEASE=%release
+make %{?_smp_mflags} RELEASE=%{release}
# Compile quilt.el for faster emacs startup (bnc#617673)
pushd lib
emacs -batch -q --no-site -f batch-byte-compile quilt.el
@@ -118,34 +108,31 @@
# /usr/share/quilt/compat/mta will be a stale symlink: we don't want to add
# sendmail to neededforbuild just because of this.
export NO_BRP_STALE_LINK_ERROR=yes
-make install BUILD_ROOT=$RPM_BUILD_ROOT
+make install BUILD_ROOT=%{buildroot}
install -m 644 lib/quilt.elc \
- $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
-mv $RPM_BUILD_ROOT/etc/bash_completion.d/quilt{,.sh}
+ %{buildroot}%{_datadir}/emacs/site-lisp/
+mv %{buildroot}%{_sysconfdir}/bash_completion.d/quilt{,.sh}
# We only needed the /usr/bin/patch compatibility symlink for the
# test suite.
-[ $RPM_BUILD_ROOT/usr/share/quilt/compat/patch -ef /usr/bin/patch ] \
- rm -f $RPM_BUILD_ROOT/usr/share/quilt/compat/patch
-[
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2012-03-07 13:45:17
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt, Maintainer is jdelv...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2012-02-28
14:15:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2012-03-07
13:45:19.0 +0100
@@ -1,0 +2,21 @@
+Fri Mar 2 14:20:24 CET 2012 - jdelv...@suse.de
+
+- Fix interaction between quilt and vimdiff (bnc#749563).
+
+---
+Thu Mar 1 21:29:26 CET 2012 - jdelv...@suse.de
+
+- Fix build (/usr/lib/quilt is gone.)
+- Turn into a noarch package.
+
+---
+Thu Mar 1 21:11:18 CET 2012 - jdelv...@suse.de
+
+- update to 0.60
+ o Includes a rewrite of backup-files from C to bash, making it
+possible to turn quilt into a noarch package.
+ o Includes several fixes to the mail command.
+ o Obsoletes fix-relative-import.patch.
+ o Obsoletes grep-support-spaces.patch.
+
+---
Old:
fix-relative-import.patch
grep-support-spaces.patch
quilt-0.51.tar.bz2
New:
quilt-0.60.tar.bz2
quilt-support-vimdiff.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.pAEpw1/_old 2012-03-07 13:45:21.0 +0100
+++ /var/tmp/diff_new_pack.pAEpw1/_new 2012-03-07 13:45:21.0 +0100
@@ -24,7 +24,7 @@
Summary:A Tool for Working with Many Patches
License:GPL-2.0+
Group: Productivity/Text/Utilities
-Version:0.51
+Version:0.60
Release:0
Requires: bzip2
Requires: coreutils
@@ -46,13 +46,13 @@
Source: %{name}-%{version}.tar.bz2
Source1:suse-start-quilt-mode.el
Patch1: expand.diff
-Patch2: fix-relative-import.patch
+patch2: quilt-support-vimdiff.patch
Patch3: patch-wrapper-rpm.diff
-Patch4: grep-support-spaces.patch
Patch5: suse-workaround-pseudo-release.patch
Patch6: quilt-stable-rebuild.patch
Url:http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
%description
Quilt allows you to easily manage large numbers of patches by keeping
@@ -73,7 +73,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -132,7 +131,6 @@
/usr/bin/quilt
/usr/share/quilt/
/usr/share/emacs/
-/usr/lib/quilt/
%config /etc/quilt.quiltrc
%config /etc/bash_completion.d/quilt.sh
%doc %{_mandir}/man1/guards.1.gz
++ quilt-0.51.tar.bz2 - quilt-0.60.tar.bz2 ++
6870 lines of diff (skipped)
++ quilt-stable-rebuild.patch ++
--- /var/tmp/diff_new_pack.pAEpw1/_old 2012-03-07 13:45:21.0 +0100
+++ /var/tmp/diff_new_pack.pAEpw1/_new 2012-03-07 13:45:21.0 +0100
@@ -1,8 +1,10 @@
-Index: quilt-0.51/Makefile.in
-===
quilt-0.51.orig/Makefile.in
-+++ quilt-0.51/Makefile.in
-@@ -227,8 +227,11 @@ doc/reference : bin/quilt $(QUILT:%=quil
+---
+ Makefile.in |5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- quilt-0.60.orig/Makefile.in
quilt-0.60/Makefile.in
+@@ -215,8 +215,11 @@ doc/reference : bin/quilt $(QUILT:%=quil
@unset LANG LC_MESSAGES LC_CTYPE LC_ALL;\
for i in $(QUILT); \
do \
@@ -10,8 +12,8 @@
+ done | sort | while read j ;\
+ do \
echo; \
-- quilt $$i -h; \
-+ quilt $$j -h; \
+- QUILT_PC=.fake_pc quilt $$i -h; \
++ QUILT_PC=.fake_pc quilt $$j -h; \
echo; \
done | \
$(SED) -e 's/\$$EDITOR ([^)]*)/$$EDITOR/' \
++ quilt-support-vimdiff.patch ++
From: Jean Delvare jdelv...@suse.de
Subject: Fix interaction between quilt and vimdiff
References: bnc#749563
Using vimdiff as a diff viewer in quilt breaks if QUILT_PAGER is set.
So inhibit the pager in that case.
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2012-02-28 14:15:35
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt, Maintainer is jdelv...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2012-02-03
10:26:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2012-02-28
14:15:37.0 +0100
@@ -1,0 +2,5 @@
+Sat Feb 25 23:50:59 CET 2012 - meiss...@suse.de
+
+- make rebuilding stable by sorting the README reference entries.
+
+---
New:
quilt-stable-rebuild.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.GkiBXK/_old 2012-02-28 14:15:38.0 +0100
+++ /var/tmp/diff_new_pack.GkiBXK/_new 2012-02-28 14:15:38.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package quilt
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,17 +15,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: quilt
-BuildRequires: diffstat ed emacs-nox procmail
+BuildRequires: diffstat
+BuildRequires: ed
+BuildRequires: emacs-nox
+BuildRequires: procmail
Summary:A Tool for Working with Many Patches
License:GPL-2.0+
Group: Productivity/Text/Utilities
Version:0.51
-Release:1
-Requires: coreutils diffutils findutils patch gzip bzip2 perl mktemp
diffstat file
+Release:0
+Requires: bzip2
+Requires: coreutils
+Requires: diffstat
+Requires: diffutils
+Requires: file
+Requires: findutils
+Requires: gzip
+Requires: mktemp
+Requires: patch
+Requires: perl
%if %{suse_version} 910
Recommends: procmail
%endif
@@ -40,6 +50,7 @@
Patch3: patch-wrapper-rpm.diff
Patch4: grep-support-spaces.patch
Patch5: suse-workaround-pseudo-release.patch
+Patch6: quilt-stable-rebuild.patch
Url:http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -64,6 +75,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb:
++ quilt-stable-rebuild.patch ++
Index: quilt-0.51/Makefile.in
===
--- quilt-0.51.orig/Makefile.in
+++ quilt-0.51/Makefile.in
@@ -227,8 +227,11 @@ doc/reference : bin/quilt $(QUILT:%=quil
@unset LANG LC_MESSAGES LC_CTYPE LC_ALL;\
for i in $(QUILT); \
do \
+ echo $$i; \
+ done | sort | while read j ;\
+ do \
echo; \
- quilt $$i -h; \
+ quilt $$j -h; \
echo; \
done | \
$(SED) -e 's/\$$EDITOR ([^)]*)/$$EDITOR/' \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2012-01-25 11:08:51
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt, Maintainer is jdelv...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2011-12-21
14:58:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2012-01-25
11:09:26.0 +0100
@@ -1,0 +2,27 @@
+Tue Jan 17 21:34:30 CET 2012 - jdelv...@suse.de
+
+- inspect-remap-outputs.patch,
+ inspect-check-if-wrapper-executable.patch: inspect: Report if
+ patch/tar wrapper can't be executed (quilt setup).
+
+---
+Fri Dec 16 14:41:39 CET 2011 - jdelv...@suse.de
+
+- Fix two rpmlint warnings.
+
+---
+Fri Dec 16 11:53:53 CET 2011 - jdelv...@suse.de
+
+- Don't call autoconf during build, assume configure script is
+ already up-to-date. This avoids problems when version of autoconf
+ is too old.
+
+---
+Thu Dec 15 15:18:04 CET 2011 - jdelv...@suse.de
+
+- Delete docdir.diff, replaced with
+ substitute-docdir-in-man-page.patch and
+ change-docdir-definition.patch. Upstream solution for the same
+ problem.
+
+---
Old:
docdir.diff
New:
change-docdir-definition.patch
inspect-check-if-wrapper-executable.patch
inspect-remap-outputs.patch
patchfns-non-exec.patch
substitute-docdir-in-man-page.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.IgyFdk/_old 2012-01-25 11:09:27.0 +0100
+++ /var/tmp/diff_new_pack.IgyFdk/_new 2012-01-25 11:09:27.0 +0100
@@ -36,12 +36,16 @@
Source: %{name}-%{version}.tar.bz2
Source1:suse-start-quilt-mode.el
Patch1: expand.diff
-Patch2: docdir.diff
+Patch2: substitute-docdir-in-man-page.patch
Patch3: patch-wrapper-rpm.diff
Patch4: grep-support-spaces.patch
Patch5: suse-workaround-pseudo-release.patch
Patch6: mail-fix-delivery-address-checking.patch
Patch7: fix-inspect.patch
+Patch8: change-docdir-definition.patch
+Patch9: patchfns-non-exec.patch
+Patch10:inspect-remap-outputs.patch
+Patch11:inspect-check-if-wrapper-executable.patch
Url:http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -68,9 +72,12 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
%build
-autoconf
# --with-rpmbuild=/usr/lib/rpm/rpmb:
#
# SUSE Autobuild uses a version of /usr/bin/rpmbuild that sources
@@ -80,12 +87,13 @@
CFLAGS=$RPM_OPT_FLAGS \
./configure --prefix=/usr \
--mandir=%{_mandir} \
+--docdir=%{_docdir}/%{name} \
--with-sendmail=/usr/sbin/sendmail \
--with-diffstat=/usr/bin/diffstat \
--with-patch-wrapper \
--with-patch=/usr/bin/patch \
--with-rpmbuild=/usr/lib/rpm/rpmb
-make %{?jobs:-j%jobs} BUILD_ROOT=$RPM_BUILD_ROOT RELEASE=%release
+make %{?jobs:-j%jobs} RELEASE=%release
# Compile quilt.el for faster emacs startup (bnc#617673)
pushd lib
emacs -batch -q --no-site -f batch-byte-compile quilt.el
@@ -102,8 +110,6 @@
install -m 644 lib/quilt.elc \
$RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
mv $RPM_BUILD_ROOT/etc/bash_completion.d/quilt{,.sh}
-#make rpmlint happy
-chmod 755 $RPM_BUILD_ROOT/%{_datadir}/quilt/scripts/patchfns
# We only needed the /usr/bin/patch compatibility symlink for the
# test suite.
[ $RPM_BUILD_ROOT/usr/share/quilt/compat/patch -ef /usr/bin/patch ] \
++ change-docdir-definition.patch ++
---
Makefile.in | 13 +++--
configure.ac |7 +--
2 files changed, 8 insertions(+), 12 deletions(-)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,7 @@
PACKAGE := @PACKAGE_NAME@
VERSION := @PACKAGE_VERSION@
RELEASE := @PACKAGE_RELEASE@
+PACKAGE_TARNAME := @PACKAGE_TARNAME@
PACKAGE_BUGREPORT := @PACKAGE_BUGREPORT@
prefix := @prefix@
@@ -213,7 +214,7 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=qu
;; \
*@DOCSUBDIR@*)\
echo $$line | \
- $(SED) -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
+ $(SED) -e 's:@DOCSUBDIR''@:$(docdir):g' \
;; \
*)
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory checked
in at 2011-12-21 14:58:35
Comparing /work/SRC/openSUSE:Factory/quilt (Old)
and /work/SRC/openSUSE:Factory/.quilt.new (New)
Package is quilt, Maintainer is jdelv...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2011-11-10
16:04:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2011-12-21
14:58:37.0 +0100
@@ -1,0 +2,46 @@
+Wed Dec 7 23:26:56 CET 2011 - jdelv...@suse.de
+
+- fix-inspect.patch: Fix inspect (quilt setup).
+
+---
+Wed Dec 7 20:53:56 CET 2011 - jdelv...@suse.de
+
+- mail-fix-delivery-address-checking.patch: quilt mail: Fix
+ delivery address checking.
+
+---
+Tue Dec 6 14:24:24 CET 2011 - jdelv...@suse.de
+
+- update to 0.50
+ o Obsoletes fix-test-create-delete.diff.
+ o Obsoletes hide-git-desc-error.diff.
+ o Obsoletes mail-dont-use-equal-tilde.diff.
+ o Obsoletes revert-should-not-hard-link.diff.
+ o Obsoletes fix-fr-import-message.diff.
+ o Obsoletes lzma-xz-support.patch, except expand part which was
+merged in expand.diff.
+ o Obsoletes inspect-lzma-xz.patch.
+ o Obsoletes fix-patch-version-detection.patch.
+ o Obsoletes setup-add-fuzz-parameter.patch.
+ o Obsoletes setup-support-reverse-patch.patch.
+ o Obsoletes completion-revert.patch.
+ o Obsoletes inspect-shell-syntax-errors.patch.
+ o Obsoletes mail-fix-a-temporary-directory-leak.patch.
+ o Too many upstream changes in 34 months to list.
+- Add missing requires: findutils.
+- Add recommends: xz.
+
+---
+Thu Dec 1 16:23:20 CET 2011 - jdelv...@suse.de
+
+- suse-workaround-pseudo-release.patch: Filter invalid characters
+ in release field (bnc#628258).
+
+---
+Thu Nov 10 21:00:07 CET 2011 - jdelv...@suse.de
+
+- grep-support-spaces.patch: grep: Accept file names with spaces.
+- mail-fix-a-temporary-directory-leak.patch: mail: Fix a temporary
+ directory leak.
+
+---
Old:
completion-revert.patch
fix-fr-import-message.diff
fix-patch-version-detection.patch
fix-test-create-delete.diff
hide-git-desc-error.diff
inspect-lzma-xz.patch
inspect-shell-syntax-errors.patch
lzma-xz-support.patch
mail-dont-use-equal-tilde.diff
quilt-0.48.tar.bz2
revert-should-not-hard-link.diff
setup-add-fuzz-parameter.patch
setup-support-reverse-patch.patch
New:
fix-inspect.patch
grep-support-spaces.patch
mail-fix-delivery-address-checking.patch
quilt-0.50.tar.bz2
suse-workaround-pseudo-release.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.tMbC1p/_old 2011-12-21 14:58:38.0 +0100
+++ /var/tmp/diff_new_pack.tMbC1p/_new 2011-12-21 14:58:38.0 +0100
@@ -23,30 +23,25 @@
Summary:A Tool for Working with Many Patches
License:GPLv2+
Group: Productivity/Text/Utilities
-Version:0.48
-Release:13
-Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat file
+Version:0.50
+Release:1
+Requires: coreutils diffutils findutils patch gzip bzip2 perl mktemp
diffstat file
%if %{suse_version} 910
Recommends: procmail
%endif
+%if %{suse_version} 1120
+Recommends: xz
+%endif
AutoReqProv:off
Source: %{name}-%{version}.tar.bz2
Source1:suse-start-quilt-mode.el
Patch1: expand.diff
Patch2: docdir.diff
Patch3: patch-wrapper-rpm.diff
-Patch4: fix-test-create-delete.diff
-Patch5: hide-git-desc-error.diff
-Patch6: mail-dont-use-equal-tilde.diff
-Patch7: revert-should-not-hard-link.diff
-Patch8: fix-fr-import-message.diff
-Patch9: lzma-xz-support.patch
-Patch10:inspect-lzma-xz.patch
-Patch11:fix-patch-version-detection.patch
-Patch12:setup-add-fuzz-parameter.patch
-Patch13:setup-support-reverse-patch.patch
-Patch14:completion-revert.patch
-Patch15:inspect-shell-syntax-errors.patch
+Patch4: grep-support-spaces.patch
+Patch5: suse-workaround-pseudo-release.patch
+Patch6: mail-fix-delivery-address-checking.patch
+Patch7: fix-inspect.patch
Url:http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -66,7 +61,13 @@
%prep
%setup -q
-%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P
13 -P 14 -P 15
+%patch1
commit quilt for openSUSE:Factory
Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2011-11-10 16:04:01 Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) Package is quilt, Maintainer is jdelv...@suse.com Changes: --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2011-10-07 00:53:08.0 +0200 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2011-11-10 16:04:03.0 +0100 @@ -1,0 +2,6 @@ +Thu Nov 10 12:25:27 CET 2011 - p...@suse.de + +- Newer file changed the output for xz compressed data so + adapt to it. + +--- Other differences: -- ++ quilt.spec ++ --- /var/tmp/diff_new_pack.1zrpLx/_old 2011-11-10 16:04:05.0 +0100 +++ /var/tmp/diff_new_pack.1zrpLx/_new 2011-11-10 16:04:05.0 +0100 @@ -1,7 +1,7 @@ # -# spec file for package quilt (Version 0.48) +# spec file for package quilt # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ inspect-lzma-xz.patch ++ --- /var/tmp/diff_new_pack.1zrpLx/_old 2011-11-10 16:04:05.0 +0100 +++ /var/tmp/diff_new_pack.1zrpLx/_new 2011-11-10 16:04:05.0 +0100 @@ -8,8 +8,10 @@ quilt/scripts/inspect.in | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) quilt-0.48.orig/quilt/scripts/inspect.in -+++ quilt-0.48/quilt/scripts/inspect.in +Index: quilt/scripts/inspect.in +=== +--- quilt-0.48/quilt/scripts/inspect.in.orig 2009-01-31 03:28:06.0 +0100 quilt-0.48/quilt/scripts/inspect.in2011-11-10 12:22:14.622721864 +0100 @@ -87,7 +87,17 @@ do echo md5sum $file 2 set -- $(md5sum $file) @@ -39,7 +41,7 @@ + set -- $(lzma -cd $file | md5sum) + echo $1 $basename + ;; -+ xz*) ++ xz*|XZ*) + echo -n x 4 + echo xz -cd $file | md5sum 2 + set -- $(xz -cd $file | md5sum) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit quilt for openSUSE:Factory
Hello community,
here is the log from the commit of package quilt for openSUSE:Factory
checked in at Fri Oct 7 00:50:28 CEST 2011.
--- openSUSE:Factory/quilt/quilt.changes2011-09-23 12:44:02.0
+0200
+++ quilt/quilt.changes 2011-10-06 18:57:11.0 +0200
@@ -1,0 +2,7 @@
+Thu Oct 6 18:53:45 CEST 2011 - oher...@suse.de
+
+- inspect-shell-syntax-errors.patch: Quote strings in inspect
+ helper script to avoid flood of shell syntax errors during
+ quilt setup -v *.spec.
+
+---
calling whatdependson for head-i586
New:
inspect-shell-syntax-errors.patch
Other differences:
--
++ quilt.spec ++
--- /var/tmp/diff_new_pack.UYlSud/_old 2011-10-07 00:50:24.0 +0200
+++ /var/tmp/diff_new_pack.UYlSud/_new 2011-10-07 00:50:24.0 +0200
@@ -46,6 +46,7 @@
Patch12:setup-add-fuzz-parameter.patch
Patch13:setup-support-reverse-patch.patch
Patch14:completion-revert.patch
+Patch15: inspect-shell-syntax-errors.patch
Url:http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -65,7 +66,7 @@
%prep
%setup -q
-%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P
13 -P 14
+%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -P 8 -P 9 -P 10 -P 11 -P 12 -P
13 -P 14 -P 15
%build
autoconf
++ inspect-shell-syntax-errors.patch ++
---
quilt/scripts/inspect.in |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- quilt-0.48.orig/quilt/scripts/inspect.in
+++ quilt-0.48/quilt/scripts/inspect.in
@@ -143,7 +143,7 @@ cat -'EOF' $tmpdir/bin/wrapper
md5sum=$1
while read md5sum_ file_
do
- if [ $md5sum = $md5sum_ ]
+ if [ $md5sum = $md5sum_ ]
then
echo ${file_#\*}
return 0
@@ -162,7 +162,7 @@ cat -'EOF' $tmpdir/bin/wrapper
while read md5sum_ file_
do
- if [ $md5sum = $md5sum_ ]
+ if [ $md5sum = $md5sum_ ]
then
echo ${file_#\*}
return 0
continue with q...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
