Autoremove imported patches from packaging
authorZhang Qiang <qiang.z.zhang@intel.com>
Fri, 11 Jul 2014 06:04:23 +0000 (14:04 +0800)
committerZhang Qiang <qiang.z.zhang@intel.com>
Fri, 11 Jul 2014 06:04:23 +0000 (14:04 +0800)
Removed all imported patches from libsatsolver.spec
and patch files from the packaging dir.

packaging/0001-Support-aarch64.patch [deleted file]
packaging/0001-remove-Werror.patch [deleted file]
packaging/libsatsolver.spec

diff --git a/packaging/0001-Support-aarch64.patch b/packaging/0001-Support-aarch64.patch
deleted file mode 100644 (file)
index 67d581d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr satsolver-0.17.7/src/poolarch.c satsolver-0.17.7.new/src/poolarch.c
---- satsolver-0.17.7/src/poolarch.c    2013-12-11 15:19:02.899232277 +0800
-+++ satsolver-0.17.7.new/src/poolarch.c        2013-12-11 15:18:53.955232109 +0800
-@@ -31,6 +31,7 @@
-   "ia64",     "ia64:i686:i586:i486:i386",
-   "ppc64",    "ppc64:ppc",
-   "ppc",      "ppc",
-+  "aarch64",   "aarch64",
-   "armv7nhl", "armv7nhl:armv7hl",
-   "armv7hl",  "armv7hl",
-   "armv7l",   "armv7l:armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l",
diff --git a/packaging/0001-remove-Werror.patch b/packaging/0001-remove-Werror.patch
deleted file mode 100644 (file)
index 0b05ed9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr satsolver-0.17.7/CMakeLists.txt satsolver-0.17.7.new/CMakeLists.txt
---- satsolver-0.17.7/CMakeLists.txt    2013-01-11 19:32:59.000000000 +0800
-+++ satsolver-0.17.7.new/CMakeLists.txt        2013-08-02 14:45:27.221916151 +0800
-@@ -184,7 +184,6 @@
- MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
--set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Werror -Wall" )
- set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" )
- set ( CMAKE_C_FLAGS_DEBUG     "${CMAKE_C_FLAGS} -g3 -O0" )
index c473a25..3e4ab28 100644 (file)
@@ -8,8 +8,6 @@ Vendor:    openSUSE
 %endif
 Source:         satsolver-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
-Patch0: 0001-remove-Werror.patch
-Patch1:  0001-Support-aarch64.patch
 #Patch1:         01-satsolver-evrcmp.patch
 #Patch2:         02-armv7txxx-support.patch
 #Patch3:         03-gcc46-buildfix.patch          
@@ -128,8 +126,6 @@ Applications demoing the satsolver library.
 %prep
 %setup -n satsolver-%{version}
 
-%patch0 -p1 
-%patch1 -p1 
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -Wno-unused-but-set-variable -Wno-uninitialized -Wno-strict-aliasing"