Am I the only one who's tried to rebuild unzip-5.40-2.src.rpm?

I don't have a clue how the original srpm managed to get generated with
a broken spec file (zipgrep is no longer built it seems).  And the old
spec file wasn't portable anymore (i386 specific), but I fixed that too.

Patch for spec file follows.

--
Andrew E. Mileski - Software Engineer
Rebel.com  http://www.rebel.com/


--- unzip.spec.orig     Mon Nov 30 12:29:39 1998
+++ unzip.spec  Mon Aug 30 18:27:49 1999
@@ -1,6 +1,6 @@
 %define name unzip
 %define version 5.40
-%define release 2
+%define release 3
 
 %define builddir /usr/src/redhat/BUILD/%{name}-%{version}
 
@@ -29,7 +29,11 @@
 %setup -q -n %{name}-%{version}
 
 %build
-make -f unix/Makefile linux
+%ifarch i386
+make -f unix/Makefile linux LOC="$RPM_OPT_FLAGS"
+%else
+make -f unix/Makefile linux_noasm LOC="$RPM_OPT_FLAGS"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,13 +44,11 @@
 install -s -o root -g root -m 755 funzip $RPM_BUILD_ROOT/usr/bin
 install -s -o root -g root -m 755 unzipsfx $RPM_BUILD_ROOT/usr/bin
 install -s -o root -g root -m 755 zipinfo $RPM_BUILD_ROOT/usr/bin
-install -s -o root -g root -m 755 unix/zipgrep $RPM_BUILD_ROOT/usr/bin
 
 install -o root -g root -m 644 unix/unzip.1 $RPM_BUILD_ROOT/usr/man/man1
 install -o root -g root -m 644 unix/funzip.1 $RPM_BUILD_ROOT/usr/man/man1
 install -o root -g root -m 644 unix/unzipsfx.1 $RPM_BUILD_ROOT/usr/man/man1
 install -o root -g root -m 644 unix/zipinfo.1 $RPM_BUILD_ROOT/usr/man/man1
-install -o root -g root -m 644 unix/zipgrep.1 $RPM_BUILD_ROOT/usr/man/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,19 +57,22 @@
 %files
 %defattr(-,root,root)
 %doc BUGS COPYING Contents History.* INSTALL README ToDo WHERE
-%doc unzip.doc unzipsfx.doc zipgrep.doc zipinfo.doc proginfo/
+%doc unzip.doc unzipsfx.doc zipinfo.doc proginfo/
 %attr(755,root,root) /usr/bin/unzip
 %attr(755,root,root) /usr/bin/funzip
 %attr(755,root,root) /usr/bin/unzipsfx
 %attr(755,root,root) /usr/bin/zipinfo
-%attr(755,root,root) /usr/bin/zipgrep
 %attr(644,root,root) /usr/man/man1/unzip.1
 %attr(644,root,root) /usr/man/man1/funzip.1
 %attr(644,root,root) /usr/man/man1/unzipsfx.1
 %attr(644,root,root) /usr/man/man1/zipinfo.1
-%attr(644,root,root) /usr/man/man1/zipgrep.1
 
 %changelog
+* Mon Aug 30 1999 Andrew E. Mileski <[EMAIL PROTECTED]>
+- made portable with linux_noasm
+- added $RPM_OPT_FLAGS
+- removed zipgrep references since it isn't built
+
 * Mon Nov 30 1998 Ryan Weaver <[EMAIL PROTECTED]>
   [unzip-5.40-2]
 - Update to full release unzip-5.40
%define name unzip
%define version 5.40
%define release 2_nw1

%define builddir /usr/src/redhat/BUILD/%{name}-%{version}

Summary: unpacks .zip files such as those made by pkzip under DOS
Name: %{name}
Version: %{version}
Release: %{release}
Copyright: distributable
Vendor: Info-Zip
Url: http://www.cdrom.com/pub/infozip
Packager: Ryan Weaver <[EMAIL PROTECTED]>
Distribution: Freshmeat RPMs
Group: Utilities/Archiving
Source: ftp://ftp.icce.rug.nl/infozip/src/unzip540.tar.gz
Prefix: /usr
Buildroot: /tmp/%{name}-%{version}-%{release}-root

%description
unzip will list, test, or extract files from a ZIP archive, commonly
found on MS-DOS systems.  A companion program, zip, creates ZIP
archives; both programs are compatible with archives created by
PKWARE's PKZIP and PKUNZIP for MS-DOS, but in many cases the program
options or default behaviors differ.

%prep
%setup -q -n %{name}-%{version}

%build
%ifarch i386
make -f unix/Makefile linux LOC="$RPM_OPT_FLAGS"
%else
make -f unix/Makefile linux_noasm LOC="$RPM_OPT_FLAGS"
%endif

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/man1}

ln -s unzip zipinfo
install -s -o root -g root -m 755 unzip $RPM_BUILD_ROOT/usr/bin
install -s -o root -g root -m 755 funzip $RPM_BUILD_ROOT/usr/bin
install -s -o root -g root -m 755 unzipsfx $RPM_BUILD_ROOT/usr/bin
install -s -o root -g root -m 755 zipinfo $RPM_BUILD_ROOT/usr/bin

install -o root -g root -m 644 unix/unzip.1 $RPM_BUILD_ROOT/usr/man/man1
install -o root -g root -m 644 unix/funzip.1 $RPM_BUILD_ROOT/usr/man/man1
install -o root -g root -m 644 unix/unzipsfx.1 $RPM_BUILD_ROOT/usr/man/man1
install -o root -g root -m 644 unix/zipinfo.1 $RPM_BUILD_ROOT/usr/man/man1

%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{builddir}

%files
%defattr(-,root,root)
%doc BUGS COPYING Contents History.* INSTALL README ToDo WHERE
%doc unzip.doc unzipsfx.doc zipinfo.doc proginfo/
%attr(755,root,root) /usr/bin/unzip
%attr(755,root,root) /usr/bin/funzip
%attr(755,root,root) /usr/bin/unzipsfx
%attr(755,root,root) /usr/bin/zipinfo
%attr(644,root,root) /usr/man/man1/unzip.1
%attr(644,root,root) /usr/man/man1/funzip.1
%attr(644,root,root) /usr/man/man1/unzipsfx.1
%attr(644,root,root) /usr/man/man1/zipinfo.1

%changelog
* Mon Aug 30 1999 Andrew E. Mileski <[EMAIL PROTECTED]>
- made portable with linux_noasm
- added $RPM_OPT_FLAGS
- removed zipgrep references since it isn't built

* Mon Nov 30 1998 Ryan Weaver <[EMAIL PROTECTED]>
  [unzip-5.40-2]
- Update to full release unzip-5.40
- Various changes check History.540 in the doc dir.

* Mon Nov 23 1998 Ryan Weaver <[EMAIL PROTECTED]>
  [unzip-5.40-1]
- Update to unzip-5.40
- Various changes from 533. Check History.540 in the doc dir.

* Fri Nov 20 1998 Ryan Weaver <[EMAIL PROTECTED]>
  [unzip-5.33-1]
- Update to unzip-5.33
- Various changes from 532. Check History.533 in the doc dir.

* Tue Oct 13 1998 Fryguy_ <[EMAIL PROTECTED]>
  [unzip-5.32-1]
- Update to unzip-5.32 and Re-wrote spec file
- Various changes from 531. Check History.532 and
  History.531 in the doc dir.

Reply via email to