From 0fd650503ec33cb6e9bf79ba81a35336ecab2930 Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Wed, 23 Jul 2014 06:54:33 -0400 Subject: [PATCH] Imported vendor release 1.0.7-2.1 --- packaging/buildfix.patch | 16 ++++++ packaging/isomd5sum-1.0.7-gcc46.patch | 12 ++++ packaging/isomd5sum.spec | 83 +++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 packaging/buildfix.patch create mode 100644 packaging/isomd5sum-1.0.7-gcc46.patch create mode 100644 packaging/isomd5sum.spec diff --git a/packaging/buildfix.patch b/packaging/buildfix.patch new file mode 100644 index 0000000..527b044 --- /dev/null +++ b/packaging/buildfix.patch @@ -0,0 +1,16 @@ +diff -ruNa isomd5sum-1.0.7.orig/Makefile isomd5sum-1.0.7/Makefile +--- isomd5sum-1.0.7.orig/Makefile 2011-06-01 19:09:01.852007667 +0800 ++++ isomd5sum-1.0.7/Makefile 2011-06-01 19:10:20.182102389 +0800 +@@ -24,10 +24,10 @@ + $(CC) -c -O $(CFLAGS) -o $@ $< + + implantisomd5: implantisomd5.o libimplantisomd5.a +- $(CC) -lpopt $(CFLAGS) implantisomd5.o libimplantisomd5.a -o implantisomd5 ++ $(CC) $(CFLAGS) implantisomd5.o libimplantisomd5.a -o implantisomd5 -lpopt + + checkisomd5: checkisomd5.o libcheckisomd5.a +- $(CC) -lpopt $(CFLAGS) checkisomd5.o libcheckisomd5.a -o checkisomd5 ++ $(CC) $(CFLAGS) checkisomd5.o libcheckisomd5.a -o checkisomd5 -lpopt + + libimplantisomd5.a: libimplantisomd5.a(libimplantisomd5.o md5.o) + diff --git a/packaging/isomd5sum-1.0.7-gcc46.patch b/packaging/isomd5sum-1.0.7-gcc46.patch new file mode 100644 index 0000000..a856e8f --- /dev/null +++ b/packaging/isomd5sum-1.0.7-gcc46.patch @@ -0,0 +1,12 @@ +diff -ruNa isomd5sum-1.0.7.orig/Makefile isomd5sum-1.0.7/Makefile +--- isomd5sum-1.0.7.orig/Makefile 2011-06-01 18:56:51.823195040 +0800 ++++ isomd5sum-1.0.7/Makefile 2011-06-01 18:58:11.399979913 +0800 +@@ -10,7 +10,7 @@ + LIBDIR = lib + endif + +-CFLAGS = $(RPM_OPT_FLAGS) -Wall -Werror -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -fPIC -I$(PYTHONINCLUDE) ++CFLAGS = $(RPM_OPT_FLAGS) -Wall -Werror -Wno-unused-but-set-variable -Wno-strict-aliasing -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 -fPIC -I$(PYTHONINCLUDE) -Wno-sizeof-pointer-memaccess + + OBJECTS = md5.o libimplantisomd5.o checkisomd5.o implantisomd5 + SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) diff --git a/packaging/isomd5sum.spec b/packaging/isomd5sum.spec new file mode 100644 index 0000000..6155a6a --- /dev/null +++ b/packaging/isomd5sum.spec @@ -0,0 +1,83 @@ +#specfile originally created for Fedora, modified for Moblin Linux +%{!?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.7 +Release: 2.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 +Patch1: buildfix.patch +Patch2: isomd5sum-1.0.7-gcc46.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: popt-devel python-devel + +%description +The isomd5sum package contains utilities for implanting and verifying +an md5sum implanted into an ISO9660 image. + +%package devel +Summary: Development headers and library for using isomd5sum +Group: Development/System +Requires: %{name} = %{version}-%{release} + +%description devel +This contains header files and a library for working with the isomd5sum +implanting and checking. + + +%prep +%setup -q +%patch1 -p1 +%patch2 -p1 + +%build +make + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + + +chmod -x %{buildroot}%{_mandir}/man*/* +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc COPYING +/usr/bin/implantisomd5 +/usr/bin/checkisomd5 +%{_mandir}/man*/* +%{python_sitearch}/pyisomd5sum.so + +%files devel +%defattr(-,root,root,-) +%{_includedir}/*.h +%{_libdir}/*.a + +%changelog +* Thu Jul 21 2011 Gui Chen - 1.0.7 +- update to 1.0.7 +* Sat Apr 10 2010 Anas Nashif - 1.0.4 +- Fixed rpmlint errors +* Sun Mar 7 2010 Anas Nashif - 1.0.4 +- Remove epoch +* Thu May 7 2009 Arjan van de Ven +- make it build with LD_AS_NEEDED=1 +* Thu Aug 7 2008 Anas Nashif +- reenabled python requirement +* Thu Feb 7 2008 Jeremy Katz - 1:1.0.4-1 +- Add man pages from Ryan Finnie (ryan AT finnie DOT org) +- Use popt in checkisomd5 (Ryan Finnie) +- Fix verbose/gauge interactions (Ryan Finnie) +- A few other little janitorial things (Ryan Finnie) +* Mon Dec 10 2007 Jeremy Katz - 1:1.0.2-1 +- The "fix the build after changing the API" release +* Mon Dec 10 2007 Jeremy Katz - 1:1.0.1-1 +- Add some simple callback support in the library +* Fri Dec 7 2007 Jeremy Katz - 1.0-1 +- Initial build. -- 2.34.1