- unified install, dropped outdated patch

diff --git a/libnsgif.spec b/libnsgif.spec
index 8c1df828a5fbea66bb09240b8edd12484066bf56..06013e9e260a07f64470d308f4bac3db46260560 100644 (file)
--- a/libnsgif.spec
+++ b/libnsgif.spec
@@ -73,12 +73,13 @@ export LDFLAGS="%{rpmldflags}"
 %endif
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
 export AR="%{__ar}"
 export CC="%{__cc}"
 export CFLAGS="%{rpmcflags}"
 export LDFLAGS="%{rpmldflags}"
 
-rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        PREFIX=%{_prefix} \
        LIBDIR=%{_lib} \

diff --git a/no-Werror.patch b/no-Werror.patch
deleted file mode 100644 (file)
index aa08b75..0000000
--- a/no-Werror.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libnsgif-0.1.2/Makefile.orig       2015-03-16 12:32:37.351846552 +0100
-+++ libnsgif-0.1.2/Makefile    2015-03-16 12:33:06.331689551 +0100
-@@ -13,10 +13,7 @@ include $(NSSHARED)/makefiles/Makefile.t
- WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
-       -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-       -Wmissing-declarations -Wnested-externs -pedantic
--# BeOS/Haiku standard library headers create warnings
--ifneq ($(BUILD),i586-pc-haiku)
--  WARNFLAGS := $(WARNFLAGS) -Werror
--endif
-+
- CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
-       -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
- ifneq ($(GCCVER),2)