[meego-commits] 5310: Changes to Trunk:Testing/gzip
Yi Yang
yi.y.yang at intel.com
Fri Jul 2 07:10:31 UTC 2010
Hi,
I have made the following changes to gzip in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Yi Yang
[This message was auto-generated]
---
Request #5310:
submit: home:yyang:branches:Trunk:Testing/gzip(r5)(cleanup) -> Trunk:Testing/gzip
Message:
Package zless as a separate subpackage (reomove less dependency from gzip)
State: new 2010-07-01T19:06:48 yyang
Comment: None
changes files:
--------------
--- gzip.changes
+++ gzip.changes
@@ -0,0 +1,4 @@
+* Wed Jun 30 2010 Yi Yang <yi.y.yang at intel.com> - 1.3.14
+- Package zless as separate package
+- Spectaclized
+
new:
----
Makefile
gzip.yaml
spec files:
-----------
--- gzip.spec
+++ gzip.spec
@@ -1,28 +1,33 @@
-#specfile originally created for Fedora, modified for Moblin Linux
-Summary: The GNU data compression program
+#
+# Do not Edit! Generated by:
+# spectacle version 0.17
+#
+# >> macros
+# << macros
+
Name: gzip
+Summary: The GNU data compression program
Version: 1.3.14
Release: 6
-# info pages are under GFDL license
-License: GPLv2 and GFDL
Group: Applications/File
-Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
+License: GPLv2 and GFDL
+URL: http://www.gzip.org/
+Source0: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
+Source100: gzip.yaml
Patch0: gzip-1.3.12-openbsd-owl-tmp.patch
Patch1: gzip-1.3.5-zforce.patch
-Patch3: gzip-1.3.9-stderr.patch
-Patch4: gzip-1.3.10-zgreppipe.patch
-Patch5: gzip-1.3.9-rsync.patch
-Patch7: gzip-1.3.9-addsuffix.patch
-Patch14: gzip-1.3.5-cve-2006-4338.patch
-Patch15: gzip-1.3.9-cve-2006-4337.patch
-Patch16: gzip-1.3.5-cve-2006-4337_len.patch
-Patch17: gzip-1.3.12-cve-2010-0001.patch
-
-URL: http://www.gzip.org/
+Patch2: gzip-1.3.9-stderr.patch
+Patch3: gzip-1.3.10-zgreppipe.patch
+Patch4: gzip-1.3.9-rsync.patch
+Patch5: gzip-1.3.9-addsuffix.patch
+Patch6: gzip-1.3.5-cve-2006-4338.patch
+Patch7: gzip-1.3.9-cve-2006-4337.patch
+Patch8: gzip-1.3.5-cve-2006-4337_len.patch
+Patch9: gzip-1.3.12-cve-2010-0001.patch
Requires: /sbin/install-info
-Requires: /bin/mktemp, /usr/bin/less
+Requires: /bin/mktemp
BuildRequires: texinfo
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
%description
The gzip package contains the popular GNU gzip data compression
@@ -31,59 +36,106 @@
Gzip should be installed on your system, because it is a
very commonly used data compression program.
+
+
+%package -n zless
+Summary: file perusal filter for crt viewing of compressed text
+Group: Applications/File
+Requires: %{name} = %{version}-%{release}
+Requires: /usr/bin/less
+
+%description -n zless
+Zless is a filter which allows examination of compressed or plain text files one
+screenful at a time on a soft-copy terminal. It is the equivalent of setting the
+environment variable LESSOPEN to '|gzip -cdfq -- %s', and the environment variable
+LESSMETACHARS to and then running less. However, enough people seem to think that
+having the command zless available is important to be worth providing it.
+
+
+
%prep
-%setup -q
-%patch0 -p1 -b .owl-tmp
-%patch1 -p1 -b .zforce
-%patch3 -p1 -b .stderr
-%patch4 -p1 -b .nixi
-%patch5 -p1 -b .rsync
-%patch7 -p1 -b .addsuffix
-%patch14 -p1 -b .4338
-%patch15 -p1 -b .4337
-%patch16 -p1 -b .4337l
-%patch17 -p1 -b .cve-2010-0001
+%setup -q -n %{name}-%{version}
+
+# gzip-1.3.12-openbsd-owl-tmp.patch
+%patch0 -p1
+# gzip-1.3.5-zforce.patch
+%patch1 -p1
+# gzip-1.3.9-stderr.patch
+%patch2 -p1
+# gzip-1.3.10-zgreppipe.patch
+%patch3 -p1
+# gzip-1.3.9-rsync.patch
+%patch4 -p1
+# gzip-1.3.9-addsuffix.patch
+%patch5 -p1
+# gzip-1.3.5-cve-2006-4338.patch
+%patch6 -p1
+# gzip-1.3.9-cve-2006-4337.patch
+%patch7 -p1
+# gzip-1.3.5-cve-2006-4337_len.patch
+%patch8 -p1
+# gzip-1.3.12-cve-2010-0001.patch
+%patch9 -p1
+# >> setup
+# << setup
+
%build
+# >> build pre
export CPPFLAGS="-DHAVE_LSTAT"
-%configure --bindir=/bin
+# << build pre
-make CFLAGS="$RPM_OPT_FLAGS -O2"
-#make gzip.info
+%configure --disable-static \
+ --bindir=/bin
+make %{?jobs:-j%jobs}
+
+# >> build post
+# << build post
%install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall bindir=${RPM_BUILD_ROOT}/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-ln -sf ../../bin/gzip ${RPM_BUILD_ROOT}%{_bindir}/gzip
-ln -sf ../../bin/gunzip ${RPM_BUILD_ROOT}%{_bindir}/gunzip
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%make_install
+
+# >> install post
+mkdir -p %{buildroot}%{_bindir}
+ln -sf ../../bin/gzip %{buildroot}%{_bindir}/gzip
+ln -sf ../../bin/gunzip %{buildroot}%{_bindir}/gunzip
for i in zcmp zegrep zforce zless znew gzexe zdiff zfgrep zgrep zmore ; do
- mv ${RPM_BUILD_ROOT}/bin/$i ${RPM_BUILD_ROOT}%{_bindir}/$i
+mv %{buildroot}/bin/$i %{buildroot}%{_bindir}/$i
done
-gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info*
-
# we don't ship it, so let's remove it from ${RPM_BUILD_ROOT}
-rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f %{buildroot}%{_infodir}/dir
# uncompress is a part of ncompress package
-rm -f ${RPM_BUILD_ROOT}/bin/uncompress
+rm -f %{buildroot}/bin/uncompress
+
+# << install post
+
+
+
+
+
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-%post
-[ -e %{_infodir}/gzip.info.gz ] && /sbin/install-info %{_infodir}/gzip.info.gz %{_infodir}/dir || :
-%preun
-if [ $1 = 0 ]; then
- [ -e %{_infodir}/gzip.info.gz ] && /sbin/install-info --delete %{_infodir}/gzip.info.gz %{_infodir}/dir || :
-fi
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+# >> files
%doc NEWS README AUTHORS ChangeLog THANKS TODO
/bin/*
%{_bindir}/*
%doc %{_mandir}/*/*
%doc %{_infodir}/gzip.info*
+# << files
+
+
+%files -n zless
+%defattr(-,root,root,-)
+# >> files zless
+%{_bindir}/zless
+%doc %{_mandir}/man1/zless*
+# << files zless
other changes:
--------------
++++++ Makefile (new)
--- Makefile
+++ Makefile
+PKG_NAME := gzip
+SPECFILE = $(addsuffix .spec, $(PKG_NAME))
+YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
+
+include /usr/share/packaging-tools/Makefile.common
+
++++++ gzip.yaml (new)
--- gzip.yaml
+++ gzip.yaml
+Name: gzip
+Summary: The GNU data compression program
+Version: 1.3.14
+Release: 6
+Group: Applications/File
+License: GPLv2 and GFDL
+URL: http://www.gzip.org/
+Sources:
+ - ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
+Patches:
+ - gzip-1.3.12-openbsd-owl-tmp.patch
+ - gzip-1.3.5-zforce.patch
+ - gzip-1.3.9-stderr.patch
+ - gzip-1.3.10-zgreppipe.patch
+ - gzip-1.3.9-rsync.patch
+ - gzip-1.3.9-addsuffix.patch
+ - gzip-1.3.5-cve-2006-4338.patch
+ - gzip-1.3.9-cve-2006-4337.patch
+ - gzip-1.3.5-cve-2006-4337_len.patch
+ - gzip-1.3.12-cve-2010-0001.patch
+Description: |
+ The gzip package contains the popular GNU gzip data compression
+ program. Gzipped files have a .gz extension.
+
+ Gzip should be installed on your system, because it is a
+ very commonly used data compression program.
+
+Requires:
+ - /sbin/install-info
+ - /bin/mktemp
+PkgBR:
+ - texinfo
+Configure: configure
+ConfigOptions:
+ - --bindir=/bin
+Builder: make
+SubPackages:
+ - Name: zless
+ AsWholeName: yes
+ Summary: file perusal filter for crt viewing of compressed text
+ Group: Applications/File
+ Description: |
+ Zless is a filter which allows examination of compressed or plain text files one
+ screenful at a time on a soft-copy terminal. It is the equivalent of setting the
+ environment variable LESSOPEN to '|gzip -cdfq -- %s', and the environment variable
+ LESSMETACHARS to and then running less. However, enough people seem to think that
+ having the command zless available is important to be worth providing it.
+ Requires:
+ - /usr/bin/less
More information about the MeeGo-commits
mailing list