- unified install, dropped outdated patch

diff --git a/libsvgtiny.spec b/libsvgtiny.spec
index bde547d1c36a665ac9798e0d2fab7f0da6bdc712..cf3d30f141d038ac81286e6c2b03c76041bc7c04 100644 (file)
--- a/libsvgtiny.spec
+++ b/libsvgtiny.spec
@@ -90,12 +90,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} -j1 install \
        Q= \
        PREFIX=%{_prefix} \

diff --git a/no-Werror.patch b/no-Werror.patch
deleted file mode 100644 (file)
index 249104a..0000000
--- a/no-Werror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libsvgtiny-0.1.3/Makefile.orig     2015-03-16 12:36:00.650745157 +0100
-+++ libsvgtiny-0.1.3/Makefile  2015-03-16 12:36:30.867248123 +0100
-@@ -15,12 +15,6 @@ TESTRUNNER := $(ECHO)
- WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
-       -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
-       -Wmissing-declarations -Wnested-externs -pedantic
--# BeOS/Haiku/AmigaOS standard library headers create warnings
--ifneq ($(BUILD),i586-pc-haiku)
--  ifneq ($(findstring amigaos,$(BUILD)),amigaos)
--    WARNFLAGS := $(WARNFLAGS) -Werror
--  endif
--endif
- 
- CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
-       -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)