Remove EXEs

1 files changed, 13 insertions, 36 deletions

diff --git a/cygwin-bzip2.spec b/cygwin-bzip2.spec
index 3688010..b367188 100644
--- a/cygwin-bzip2.spec
+++ b/cygwin-bzip2.spec
@@ -9,7 +9,7 @@
 
 Name:           cygwin-bzip2
 Version:        1.0.6
-Release:        1
+Release:        2
 Summary:        Cygwin port of bzip2 file compression utility
 
 License:        BSD
@@ -57,46 +57,31 @@ make -f Makefile-libbz2_so \
   CC="%{_cygwin_cc}" \
   AR="%{_cygwin_ar}" \
   RANLIB="%{_cygwin_ranlib}" \
-  CFLAGS="%{_cygwin_cflags} -D_FILE_OFFSET_BITS=64" \
+  CFLAGS="%{_cygwin_cflags}" \
   %{?_smp_mflags} all
 
+# only needed for static libs or tests
+%if 0
 rm -f *.o
 make CC="%{_cygwin_cc}" \
   AR="%{_cygwin_ar}" \
   RANLIB="%{_cygwin_ranlib}" \
-  CFLAGS="%{_cygwin_cflags} -D_FILE_OFFSET_BITS=64" \
+  CFLAGS="%{_cygwin_cflags}" \
   %{?_smp_mflags} \
 %if %{run_tests}
   all
 %else
-  libbz2.a bzip2 bzip2recover
+  libbz2.a
+%endif
 %endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make PREFIX=$RPM_BUILD_ROOT%{_cygwin_prefix} install
-
-# The binaries which are symlinks contain the full buildroot
-# name in the symlink, so replace those.
-pushd $RPM_BUILD_ROOT%{_cygwin_bindir}
-rm bzcmp bzegrep bzfgrep bzless
-ln -s bzdiff bzcmp
-ln -s bzgrep bzegrep
-ln -s bzgrep bzfgrep
-ln -s bzmore bzless
-popd
-
-# Remove the manpages, they're duplicates of the native package,
-# and located in the wrong place anyway.
-rm -rf $RPM_BUILD_ROOT%{_cygwin_prefix}/man
 
-# The Makefile doesn't install the DLL.
-install -m0755 cygbz2-1.dll $RPM_BUILD_ROOT%{_cygwin_bindir}/
-install -m0644 libbz2.dll.a $RPM_BUILD_ROOT%{_cygwin_libdir}/
-
-# Remove the static library.
-rm $RPM_BUILD_ROOT%{_cygwin_libdir}/libbz2.a
+install -D -m0755 cygbz2-1.dll $RPM_BUILD_ROOT%{_cygwin_bindir}/cygbz2-1.dll
+install -D -m0644 bzlib.h $RPM_BUILD_ROOT%{_cygwin_includedir}/bzlib.h
+install -D -m0644 libbz2.dll.a $RPM_BUILD_ROOT%{_cygwin_libdir}/libbz2.dll.a
 
 
 %clean
@@ -109,19 +94,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_cygwin_bindir}/cygbz2-1.dll
 %{_cygwin_includedir}/bzlib.h
 %{_cygwin_libdir}/libbz2.dll.a
-%{_cygwin_bindir}/bunzip2
-%{_cygwin_bindir}/bzcat
-%{_cygwin_bindir}/bzcmp
-%{_cygwin_bindir}/bzdiff
-%{_cygwin_bindir}/bzegrep
-%{_cygwin_bindir}/bzfgrep
-%{_cygwin_bindir}/bzgrep
-%{_cygwin_bindir}/bzip2
-%{_cygwin_bindir}/bzip2recover
-%{_cygwin_bindir}/bzless
-%{_cygwin_bindir}/bzmore
 
 
 %changelog
+* Sun Aug 21 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.0.6-2
+- Remove Cygwin EXEs.
+
 * Wed Mar 16 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 1.0.6-1
 - Initial spec file, largely based on mingw32-bzip2.