Autoremove imported patches from packaging
authorGui Chen <gui.chen@intel.com>
Wed, 23 Jul 2014 10:54:33 +0000 (06:54 -0400)
committerGui Chen <gui.chen@intel.com>
Wed, 23 Jul 2014 10:54:33 +0000 (06:54 -0400)
Removed all imported patches from isomd5sum.spec
and patch files from the packaging dir.

packaging/buildfix.patch [deleted file]
packaging/isomd5sum-1.0.7-gcc46.patch [deleted file]
packaging/isomd5sum.spec

diff --git a/packaging/buildfix.patch b/packaging/buildfix.patch
deleted file mode 100644 (file)
index 527b044..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644 (file)
index a856e8f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-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))
index 6155a6a35212312f2f74252da527abe76b8b9b2d..5045ed6b586ec24c1f26fde9f8b395d691cb8aa8 100644 (file)
@@ -9,8 +9,6 @@ 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
 
@@ -30,8 +28,6 @@ implanting and checking.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 make