Accepting request 112489 from home:jengelh:branches:games

- Avoid use of descending relative paths in %files
- Add patch to allow using %optflags and resolve the
  prior rpmlint message about the lack of it

OBS-URL: https://build.opensuse.org/request/show/112489
OBS-URL: https://build.opensuse.org/package/show/games/angelscript?expand=0&rev=2

angelscript.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  4 17:08:10 UTC 2012 - jengelh@medozas.de
+
+- Avoid use of descending relative paths in %files
+- Add patch to allow using %optflags and resolve the
+  prior rpmlint message about the lack of it
+
 -------------------------------------------------------------------
 Sun Mar  4 18:33:21 UTC 2012 - joop.boonen@opensuse.org
 

angelscript.spec

@@ -15,17 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           angelscript
 Version:        2.22.2
 Release:        0
-License:        Zlib
 %define soname 2
 Summary:        It is an extremely flexible cross-platform scripting library
-Url:            http://www.angelcode.com/angelscript/
+License:        Zlib
 Group:          Development/Libraries/C and C++
+Url:            http://www.angelcode.com/angelscript/
 Source:         %{name}_%{version}.zip
+Patch1:         makefile-flags.diff
 #  PATCH-FIX-OPENSUSE angelscript-makefile.patch fixed soname and build issues
-Patch0:         %{name}-makefile.patch
+Patch2:         %{name}-makefile.patch
 BuildRequires:  gcc-c++
 BuildRequires:  unzip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -53,14 +55,18 @@ It supports Unix sockets and TCP/IP sockets with optional SSL/TLS (OpenSSL) supp
 %postun -n libangelscript%{soname} -p /sbin/ldconfig
 
 %prep
-%setup -q -n sdk/angelscript/projects/gnuc
+%setup -qn sdk
-%patch0 -p4
+%patch -P 1 -P 2 -p1
 
 %build
-make %{?_smp_mflags} SHARED=1
+pushd angelscript/projects/gnuc/
+make %{?_smp_mflags} SHARED=1 CXXFLAGS="%optflags"
+popd
 
 %install
+pushd angelscript/projects/gnuc/
 make install DESTDIR=%{buildroot} DESTLIBDIR=%{_libdir} SHARED=1
+popd
 
 %files -n libangelscript%{soname}
 %defattr(-,root,root)
@@ -71,6 +77,6 @@ make install DESTDIR=%{buildroot} DESTLIBDIR=%{_libdir} SHARED=1
 %defattr(-,root,root)
 %{_includedir}/*.h
 %{_libdir}/libangelscript.so
-%doc ../../../docs/manual/*
+%doc docs/manual/*
 
 %changelog

makefile-flags.diff

@@ -0,0 +1,57 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: 2012-04-04 18:58:52.144352570 +0200
+
+Do not touch CXXFLAGS so that it can be overridden by the user.
+
+---
+ angelscript/projects/gnuc/makefile |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+Index: sdk/angelscript/projects/gnuc/makefile
+===================================================================
+--- sdk.orig/angelscript/projects/gnuc/makefile
++++ sdk/angelscript/projects/gnuc/makefile
+@@ -26,7 +26,7 @@ ifeq ($(TARGETPLATFORM), iphone)
+ 	OBJDIR = obj-iphone
+ 	LIBDIR = ../../lib-iphone
+ 	CXX = $(IPHONEBIN)/arm-apple-darwin9-g++-4.0.1 
+-	CXXFLAGS += -g -Wall -fPIC  -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.sdk
++	my_CXXFLAGS += -g -Wall -fPIC  -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.2.sdk
+ else ifeq ($(TARGETPLATFORM), android)
+ 	ANDROIDNDKROOT = /cygdrive/c/android/android-ndk-1.6_r1
+ 	ANDROIDBIN = $(ANDROIDNDKROOT)/build/prebuilt/windows/arm-eabi-4.2.1/bin
+@@ -34,7 +34,7 @@ else ifeq ($(TARGETPLATFORM), android)
+ 	OBJDIR = obj-android
+ 	LIBDIR = ../../lib-android
+ 	CXX = $(ANDROIDBIN)/arm-eabi-gcc
+-	CXXFLAGS += -g -Wall -I$(SYSROOT)/usr/include \
++	my_CXXFLAGS += -g -Wall -I$(SYSROOT)/usr/include \
+ 	-Wall \
+ 	-DANDROID \
+ 	-fno-exceptions \
+@@ -46,7 +46,7 @@ else
+ 	CXX ?= gcc
+ 	# On i686 architecture you may need to add -march=i686 if you get 
+ 	# an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
+-	CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
++	my_CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
+ endif
+ 
+ AR ?= ar
+@@ -120,13 +120,13 @@ $(LIBDIR):
+ 	mkdir $(LIBDIR)
+ 
+ $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
+-	$(CXX) $(CXXFLAGS) -o $@ -c $<
++	$(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
+ 
+ $(OBJDIR)/%.o: $(SRCDIR)/%.S
+-	$(CXX) $(CXXFLAGS) -o $@ -c $<
++	$(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
+ 
+ $(OBJDIR)/%.o: $(SRCDIR)/%.s
+-	$(CXX) $(CXXFLAGS) -o $@ -c $<
++	$(CXX) $(my_CXXFLAGS) $(CXXFLAGS) -o $@ -c $<
+ 
+ 
+ clean: