From 3196ea0731cba7f465a93500047b1385f407ea6c Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Thu, 8 Jan 2009 22:06:04 +0000
Subject: [PATCH] - Don't install the unused python module (#479005)

---
 .cvsignore                                |  2 +-
 isomd5sum-1.0.4-manpage-permissions.patch | 14 --------------
 isomd5sum-1.0.4-sparc64.patch             | 11 -----------
 isomd5sum.spec                            | 20 ++++++++------------
 sources                                   |  2 +-
 5 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 isomd5sum-1.0.4-manpage-permissions.patch
 delete mode 100644 isomd5sum-1.0.4-sparc64.patch

diff --git a/.cvsignore b/.cvsignore
index 42d1be8..b2abbff 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-isomd5sum-1.0.4.tar.bz2
+isomd5sum-1.0.5.tar.bz2
diff --git a/isomd5sum-1.0.4-manpage-permissions.patch b/isomd5sum-1.0.4-manpage-permissions.patch
deleted file mode 100644
index 24f1cc3..0000000
--- a/isomd5sum-1.0.4-manpage-permissions.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up isomd5sum-1.0.4/Makefile.orig isomd5sum-1.0.4/Makefile
---- isomd5sum-1.0.4/Makefile.orig	2008-11-05 15:12:05.000000000 +0100
-+++ isomd5sum-1.0.4/Makefile	2008-11-05 15:16:25.000000000 +0100
-@@ -41,8 +41,8 @@ install: all
- 	mkdir -p $(DESTDIR)/usr/share/man/man1
- 	install -m 755 implantisomd5 $(DESTDIR)/usr/bin
- 	install -m 755 checkisomd5 $(DESTDIR)/usr/bin
--	install -m 755 implantisomd5.1 $(DESTDIR)/usr/share/man/man1
--	install -m 755 checkisomd5.1 $(DESTDIR)/usr/share/man/man1
-+	install -m 644 implantisomd5.1 $(DESTDIR)/usr/share/man/man1
-+	install -m 644 checkisomd5.1 $(DESTDIR)/usr/share/man/man1
- 	install -m 755 pyisomd5sum.so $(DESTDIR)/usr/$(LIBDIR)/$(PYTHON)/site-packages
- #	ln -s ../../bin/implantisomd5 $(DESTDIR)/usr/lib/anaconda-runtime/implantisomd5
- #	ln -s ../../bin/checkisomd5 $(DESTDIR)/usr/lib/anaconda-runtime/checkisomd5
diff --git a/isomd5sum-1.0.4-sparc64.patch b/isomd5sum-1.0.4-sparc64.patch
deleted file mode 100644
index 5641f99..0000000
--- a/isomd5sum-1.0.4-sparc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- isomd5sum-1.0.4/Makefile.BAD	2008-04-24 07:33:17.000000000 -0500
-+++ isomd5sum-1.0.4/Makefile	2008-04-24 07:33:49.000000000 -0500
-@@ -2,7 +2,7 @@
- PYTHON = python$(PYVER)
- PYTHONINCLUDE = /usr/include/$(PYTHON)
- 
--ifneq (,$(filter ppc64 x86_64 s390x,$(shell uname -m)))
-+ifneq (,$(filter ppc64 x86_64 s390x sparc64,$(shell uname -m)))
- LIBDIR = lib64
- else
- LIBDIR = lib
diff --git a/isomd5sum.spec b/isomd5sum.spec
index 92912ae..fc43428 100644
--- a/isomd5sum.spec
+++ b/isomd5sum.spec
@@ -1,18 +1,14 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Summary: Utilities for working with md5sum implanted in ISO images
 Name: isomd5sum
-Version: 1.0.4
-Release: 4%{?dist}
+Version: 1.0.5
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: Applications/System
 URL: http://git.fedorahosted.org/git/?p=isomd5sum.git;a=summary
 Source0: http://fedorahosted.org/releases/i/s/isomd5sum/%{name}-%{version}.tar.bz2
-Patch0: isomd5sum-1.0.4-sparc64.patch
-Patch1: isomd5sum-1.0.4-manpage-permissions.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel popt-devel
+BuildRequires: popt-devel
 
 %description
 The isomd5sum package contains utilities for implanting and verifying
@@ -30,15 +26,13 @@ implanting and checking.
 
 %prep
 %setup -q
-%patch0 -p1 
-%patch1 -p1 
 
 %build
-make
+make checkisomd5 implantisomd5
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install-bin install-devel
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,7 +44,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/implantisomd5
 /usr/bin/checkisomd5
 %{_mandir}/man*/*
-%{python_sitearch}/pyisomd5sum.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -58,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu Jan  8 2009 Jeremy Katz <katzj@redhat.com> - 1:1.0.5-1
+- Don't install the unused python module (#479005)
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1:1.0.4-4
 - Rebuild for Python 2.6
 
diff --git a/sources b/sources
index 83b3066..2ff2131 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0550f7c4546e5ca7885339ede6761ed3  isomd5sum-1.0.4.tar.bz2
+d98eb78c77e2ce94a389d243d76d845c  isomd5sum-1.0.5.tar.bz2