commit gzip for openSUSE:Factory
Hello community, here is the log from the commit of package gzip for openSUSE:Factory checked in at 2014-05-22 20:38:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gzip (Old) and /work/SRC/openSUSE:Factory/.gzip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gzip" Changes: -------- --- /work/SRC/openSUSE:Factory/gzip/gzip.changes 2013-09-27 17:32:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gzip.new/gzip.changes 2014-05-22 20:38:13.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 12 15:44:03 UTC 2014 - vdziewiecki@suse.com + +- Remove unneeded update-alternatives requirement (bnc#876129) +- Clean spec + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gzip.spec ++++++ --- /var/tmp/diff_new_pack.hEg3Zk/_old 2014-05-22 20:38:18.000000000 +0200 +++ /var/tmp/diff_new_pack.hEg3Zk/_new 2014-05-22 20:38:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gzip # -# 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 @@ -17,17 +17,16 @@ Name: gzip -Url: http://www.gnu.org/software/gzip/ Version: 1.6 Release: 0 Summary: GNU Zip Compression Utilities License: GPL-2.0+ Group: Productivity/Archiving/Compression - +Url: http://www.gnu.org/software/gzip/ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig -Source3: %name.keyring -Patch: zgrep.diff +Source3: %{name}.keyring +Patch0: zgrep.diff Patch1: tempfile.diff Patch2: zmore.diff Patch3: non-exec-stack.diff @@ -35,10 +34,10 @@ Patch6: zdiff.diff # PATCH FIX OPENSUSE BNC#799561 - zgrep silently fails on LZMA compressed files Patch7: xz_lzma.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: makeinfo BuildRequires: xz -PreReq: %{install_info_prereq} update-alternatives +Requires(post): %{install_info_prereq} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Gzip reduces the size of the named files using Lempel-Ziv coding LZ77. @@ -47,18 +46,18 @@ times. %prep -%{?gpg_verify: %gpg_verify %{S:2}} +%{?gpg_verify: %gpg_verify %{SOURCE2}} %setup -q -%patch +%patch0 %patch1 -%patch -P 2 -p1 +%patch2 -p1 %patch3 %patch4 -p1 %patch6 %patch7 -p1 %build -CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer \ +CFLAGS="%{optflags} -fomit-frame-pointer \ -W -Wall -Wno-unused-parameter -Wstrict-prototypes -Wpointer-arith" %configure --disable-silent-rules \ gl_cv_func_printf_directive_n=yes \ @@ -74,7 +73,7 @@ %if %{do_profiling} make %{?_smp_mflags} CFLAGS="$CFLAGS -fprofile-generate" profile_gzip -make clean +make clean %{?_smp_mflags} make %{?_smp_mflags} CFLAGS="$CFLAGS -fprofile-use" %else make %{?_smp_mflags} @@ -92,13 +91,13 @@ done %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} #UsrMerge -mkdir -p $RPM_BUILD_ROOT/bin -ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat $RPM_BUILD_ROOT/bin +mkdir -p %{buildroot}/bin +ln -sf %{_bindir}/gzip %{_bindir}/gunzip %{_bindir}/zcat %{buildroot}/bin #EndUsrMerge -ln -sf zmore $RPM_BUILD_ROOT%{_bindir}/zless -ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1 +ln -sf zmore %{buildroot}%{_bindir}/zless +ln -sf zmore.1 %{buildroot}%{_mandir}/man1/zless.1 %files %defattr(-, root, root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de