Accepting request 162828 from home:namtrac:bugfix

- Cleanup spec file
- Add Source URL, see https://en.opensuse.org/SourceUrls

OBS-URL: https://build.opensuse.org/request/show/162828
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=66

quilt-0.60.tar.bz2

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

quilt-0.60.tar.gz

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

quilt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  5 12:49:39 UTC 2013 - idonmez@suse.com
+
+- Cleanup spec file
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
 -------------------------------------------------------------------
 Fri Oct 19 14:17:34 CEST 2012 - jdelvare@suse.de
 

quilt.spec

@@ -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:       gzip
 Requires:       mktemp
 Requires:       patch
 Requires:       perl
-%if %{suse_version} > 910
+Url:            http://savannah.nongnu.org/projects/quilt
-Recommends:     procmail
+Source:         http://download.savannah.gnu.org/releases/quilt/%{name}-%{version}.tar.gz
-%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:         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 @@ 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
-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 @@ un-applied, refreshed, and more.
 Quilt originally was based on Andrew Morton's patch scripts found at
 http://www.zip.com.au/~akpm/linux/patches/.
 
-
-
-Authors:
---------
-    Andreas Gruenbacher <agruen@suse.de>
-    Jean Delvare <jdelvare@suse.de>
-
 %prep
 %setup -q
 %patch1 -p1
@@ -96,7 +86,7 @@ Authors:
 #   /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 @@ CFLAGS="$RPM_OPT_FLAGS" \
     --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 @@ make check
 # /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/
+	%{buildroot}%{_datadir}/emacs/site-lisp/
-mv $RPM_BUILD_ROOT/etc/bash_completion.d/quilt{,.sh}
+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 ] \
+[ %{buildroot}%{_datadir}/quilt/compat/patch -ef /usr/bin/patch ] \
-    && rm -f $RPM_BUILD_ROOT/usr/share/quilt/compat/patch
+    && rm -f %{buildroot}%{_datadir}/quilt/compat/patch
-[ $RPM_BUILD_ROOT/usr/share/quilt/compat/awk -ef /usr/bin/awk ] \
+[ %{buildroot}%{_datadir}/quilt/compat/awk -ef /usr/bin/awk ] \
-    && rm -f $RPM_BUILD_ROOT/usr/share/quilt/compat/awk
+    && rm -f %{buildroot}%{_datadir}/quilt/compat/awk
 %{find_lang} %{name}
 # Make "vi" an alias for the edit command
-ln -s edit $RPM_BUILD_ROOT/usr/share/quilt/vi
+ln -s edit %{buildroot}%{_datadir}/quilt/vi
 # Autoload quilt-mode in the SuSE emacs package
 install -m 644 %_sourcedir/suse-start-quilt-mode.el \
-	$RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
+	%{buildroot}%{_datadir}/emacs/site-lisp/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-/usr/bin/guards
+%{_bindir}/guards
-/usr/bin/quilt
+%{_bindir}/quilt
-/usr/share/quilt/
+%{_datadir}/quilt/
-/usr/share/emacs/
+%{_datadir}/emacs/
-%config /etc/quilt.quiltrc
+%config %{_sysconfdir}/quilt.quiltrc
-%config /etc/bash_completion.d/quilt.sh
+%config %{_sysconfdir}/bash_completion.d/quilt.sh
 %doc %{_mandir}/man1/guards.1.gz
 %doc %{_mandir}/man1/quilt.1.gz
 %doc doc/README