diff --git a/angelscript-makefile.patch b/angelscript-makefile.patch index 82ccea9..88b197f 100644 --- a/angelscript-makefile.patch +++ b/angelscript-makefile.patch @@ -1,41 +1,26 @@ diff -Naur sdk.orig/angelscript/projects/gnuc/makefile sdk/angelscript/projects/gnuc/makefile --- sdk.orig/angelscript/projects/gnuc/makefile 2011-09-16 23:31:42.000000000 +0200 -+++ sdk/angelscript/projects/gnuc/makefile 2012-03-04 19:24:43.000000000 +0100 -@@ -4,9 +4,14 @@ - # For 'make install' to work, set LOCAL according to your system configuration - LOCAL = /usr/local - -+# Predefined variables -+VERSION = 2.25.1 -+SONAME = 2 -+ - # If you want to build a shared library, then run make with SHARED=1 and VERSION=version - ifdef SHARED -- LIB = libangelscript-$(VERSION).so -+ LIB = libangelscript.so.$(VERSION) -+ SONAMELIB = libangelscript.so.$(SONAME) - DEVLIB = libangelscript.so - else - LIB = libangelscript.a -@@ -100,8 +105,7 @@ - ++++ sdk/angelscript/projects/gnuc/makefile 2012-12-09 11:46:03.652424096 +0100 +@@ -101,7 +101,6 @@ $(BIN): $(OBJDIR) $(LIBDIR) $(OBJ) ifdef SHARED -- $(CXX) -shared -Wl,-soname,$(LIB) -o $(BIN) $(OBJ) + $(CXX) -shared -Wl,-soname,$(LIB) -o $(BIN) $(OBJ) - ( cd $(LIBDIR); ln -s $(LIB) $(DEVLIB) ) -+ $(CXX) -shared -Wl,-soname,$(SONAMELIB) -o $(BIN) $(OBJ) else $(AR) r $(BIN) $(OBJ) $(RANLIB) $(BIN) -@@ -132,10 +136,14 @@ - @echo Installing to: $(LOCAL)/lib and $(LOCAL)/include... +@@ -129,13 +128,16 @@ + $(DELETER) $(OBJ) $(BIN) $(LIBDIR)/$(DEVLIB) + + install: $(BIN) +- @echo Installing to: $(LOCAL)/lib and $(LOCAL)/include... ++ @echo Installing to: $(DESTDIR)/$(DESTLIBDIR) and $(DESTDIR)/include... @echo ------------------------------------------------------------------- ifdef SHARED - $(COPIER) $(LIBDIR)/$(DEVLIB) $(LOCAL)/lib -+ ( cd $(LIBDIR); ln -s $(LIB) $(DEVLIB) ; ln -s $(LIB) $(SONAMELIB) ) ++ ( cd $(LIBDIR); ln -s $(LIB) $(DEVLIB) ) + mkdir -p $(DESTDIR)/$(DESTLIBDIR) + $(COPIER) $(LIBDIR)/$(DEVLIB) $(DESTDIR)/$(DESTLIBDIR) -+ $(COPIER) $(LIBDIR)/$(SONAMELIB) $(DESTDIR)/$(DESTLIBDIR) endif - $(COPIER) $(BIN) $(LOCAL)/lib - $(COPIER) $(INCDIR)/$(INC) $(LOCAL)/include diff --git a/angelscript.changes b/angelscript.changes index 63f5edb..7f126af 100644 --- a/angelscript.changes +++ b/angelscript.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 9 11:13:54 UTC 2012 - joop.boonen@opensuse.org + +- Build version 2.25.2 + ------------------------------------------------------------------- Thu Nov 15 22:14:23 UTC 2012 - joop.boonen@opensuse.org diff --git a/angelscript.spec b/angelscript.spec index c2b5d43..0492b03 100644 --- a/angelscript.spec +++ b/angelscript.spec @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%define soname 2_25_2 Name: angelscript -Version: 2.25.1 +Version: 2.25.2 Release: 0 -%define soname 2 Summary: It is an extremely flexible cross-platform scripting library License: Zlib Group: Development/Libraries/C and C++ @@ -36,25 +35,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer. -%package -n libangelscript%{soname} +%package -n lib%{name}-%{soname} Summary: It is an extremely flexible cross-platform scripting library Group: System/Libraries -%description -n libangelscript%{soname} +%description -n lib%{name}-%{soname} It supports Unix sockets and TCP/IP sockets with optional SSL/TLS (OpenSSL) support. It allows you to write portable and secure network applications quickly without needing to spend time learning low-level system functions or reading OpenSSL manuals. -%package -n libangelscript-devel +%package devel Summary: It is an extremely flexible cross-platform scripting library Group: Development/Libraries/C and C++ -Requires: libangelscript%{soname} = %{version} +Requires: lib%{name}-%{soname} = %{version} -%description -n libangelscript-devel +%description devel It supports Unix sockets and TCP/IP sockets with optional SSL/TLS (OpenSSL) support. It allows you to write portable and secure network applications quickly without needing to spend time learning low-level system functions or reading OpenSSL manuals. -%post -n libangelscript%{soname} -p /sbin/ldconfig - -%postun -n libangelscript%{soname} -p /sbin/ldconfig - %prep %setup -qn sdk %patch1 -p1 @@ -62,23 +57,26 @@ It supports Unix sockets and TCP/IP sockets with optional SSL/TLS (OpenSSL) supp %build pushd angelscript/projects/gnuc/ -make %{?_smp_mflags} SHARED=1 CXXFLAGS="%{optflags}" +make %{?_smp_mflags} SHARED=1 CXXFLAGS="%{optflags}" SHARED=1 VERSION=%{version} popd %install pushd angelscript/projects/gnuc/ -make install DESTDIR=%{buildroot} DESTLIBDIR=%{_libdir} SHARED=1 +make install DESTDIR=%{buildroot} DESTLIBDIR=%{_libdir} SHARED=1 VERSION=%{version} popd -%files -n libangelscript%{soname} -%defattr(-,root,root) -%{_libdir}/libangelscript.so.%{soname} -%{_libdir}/libangelscript.so.%{soname}.* +%post -n lib%{name}-%{soname} -p /sbin/ldconfig -%files -n libangelscript-devel +%postun -n lib%{name}-%{soname} -p /sbin/ldconfig + +%files -n lib%{name}-%{soname} +%defattr(-,root,root) +%{_libdir}/libangelscript-%{version}.so + +%files devel %defattr(-,root,root) %{_includedir}/*.h %{_libdir}/libangelscript.so -%doc docs/manual/* +%doc docs/manual/ %changelog diff --git a/angelscript_2.25.1.zip b/angelscript_2.25.1.zip deleted file mode 100644 index 9be24ab..0000000 --- a/angelscript_2.25.1.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1a1d274f7f70f7c32c3d95ebdaf01aeb55cbd6204a03c7e3dda0716c3698143 -size 1227976 diff --git a/angelscript_2.25.2.zip b/angelscript_2.25.2.zip new file mode 100644 index 0000000..0211ef3 --- /dev/null +++ b/angelscript_2.25.2.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84f2befc22f0541becf987519f6dc3d5dd561547bb5e6219327374ead0d516eb +size 1232872 diff --git a/makefile-flags.diff b/makefile-flags.diff index 70fd7e7..2a8390a 100644 --- a/makefile-flags.diff +++ b/makefile-flags.diff @@ -1,31 +1,6 @@ diff -Naur sdk.orig/angelscript/projects/gnuc/makefile sdk/angelscript/projects/gnuc/makefile --- sdk.orig/angelscript/projects/gnuc/makefile 2012-02-03 20:37:58.000000000 +0100 -+++ sdk/angelscript/projects/gnuc/makefile 2012-11-15 23:12:36.000000000 +0100 -@@ -21,13 +21,13 @@ - OBJDIR = obj-iphone - LIBDIR = ../../lib-iphone - CXX = $(IPHONEBIN)/clang++ -- CXXFLAGS += -O2 -Wall -fPIC -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -miphoneos-version-min=3.0 -+ my_CXXFLAGS += -O2 -Wall -fPIC -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -miphoneos-version-min=3.0 - else ifeq ($(TARGETPLATFORM), iphonesimulator) - IPHONEBIN = /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin - OBJDIR = obj-iphone - LIBDIR = ../../lib-iphone - CXX = $(IPHONEBIN)/clang++ -- CXXFLAGS += -O2 -Wall -fPIC -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk -miphoneos-version-min=3.0 -+ my_CXXFLAGS += -O2 -Wall -fPIC -arch i386 -isysroot /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk -miphoneos-version-min=3.0 - else ifeq ($(TARGETPLATFORM), android) - ANDROIDNDKROOT = /cygdrive/c/android/android-ndk-1.6_r1 - ANDROIDBIN = $(ANDROIDNDKROOT)/build/prebuilt/windows/arm-eabi-4.2.1/bin -@@ -35,7 +35,7 @@ - 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 \ ++++ sdk/angelscript/projects/gnuc/makefile 2012-12-09 12:12:18.084068824 +0100 @@ -47,7 +47,7 @@ CXX ?= gcc # On i686 architecture you may need to add -march=i686 if you get