Accepting request 262795 from home:Mailaender:branches:games

required for the next version of keeperrl

OBS-URL: https://build.opensuse.org/request/show/262795
OBS-URL: https://build.opensuse.org/package/show/games/angelscript?expand=0&rev=5
This commit is contained in:
Rusmir Duško 2014-11-23 21:32:37 +00:00 committed by Git OBS Bridge
parent 3007a9ad7e
commit a71ec9d14b
6 changed files with 40 additions and 94 deletions

View File

@ -1,32 +0,0 @@
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-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)
- ( cd $(LIBDIR); ln -s $(LIB) $(DEVLIB) )
else
$(AR) r $(BIN) $(OBJ)
$(RANLIB) $(BIN)
@@ -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) )
+ mkdir -p $(DESTDIR)/$(DESTLIBDIR)
+ $(COPIER) $(LIBDIR)/$(DEVLIB) $(DESTDIR)/$(DESTLIBDIR)
endif
- $(COPIER) $(BIN) $(LOCAL)/lib
- $(COPIER) $(INCDIR)/$(INC) $(LOCAL)/include
+ $(COPIER) $(BIN) $(DESTDIR)/$(DESTLIBDIR)
+ mkdir -p $(DESTDIR)/usr/include
+ $(COPIER) $(INCDIR)/$(INC) $(DESTDIR)/usr/include
@echo -------------------------------------------------------------------
@echo Angelscript library installed. Enjoy!

View File

@ -1,12 +1,19 @@
-------------------------------------------------------------------
Sun Nov 23 18:07:07 UTC 2014 - mailaender@opensuse.org
- Build version 2.29.2
- Use en.opensuse.org/SourceUrls
- Remove upstreamed makefile-flags.diff and angelscript-makefile.patch
-------------------------------------------------------------------
Sun Dec 9 11:13:54 UTC 2012 - joop.boonen@opensuse.org
- Build version 2.25.2
- Build version 2.25.2
-------------------------------------------------------------------
Thu Nov 15 22:14:23 UTC 2012 - joop.boonen@opensuse.org
- Build version 2.25.1
- Build version 2.25.1
-------------------------------------------------------------------
Wed Apr 4 17:08:10 UTC 2012 - jengelh@medozas.de
@ -20,12 +27,12 @@ Sun Mar 4 18:33:21 UTC 2012 - joop.boonen@opensuse.org
- added docs
- corrected the patch now it the soname and the devel file
are symlinked to the version file
are symlinked to the version file
-------------------------------------------------------------------
Sun Mar 4 01:27:09 UTC 2012 - joop.boonen@opensuse.org
- cleaned the spec file by means of spec-cleaner
- cleaned the spec file by means of spec-cleaner
-------------------------------------------------------------------
Sat Mar 3 21:34:28 UTC 2012 - joop.boonen@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package angelscript
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,19 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define soname 2_25_2
Name: angelscript
Version: 2.25.2
Version: 2.29.2
Release: 0
Summary: It is an extremely flexible cross-platform scripting library
License: Zlib
Group: Development/Libraries/C and C++
Url: http://www.angelcode.com/angelscript/
Source: %{name}_%{version}.zip
# PATCH-FEATURE-UPSTREAM makefile-flags.diff
Patch1: makefile-flags.diff
# PATCH-FIX-OPENSUSE angelscript-makefile.patch fixed soname and build issues
Patch2: %{name}-makefile.patch
Source: http://www.angelcode.com/angelscript/sdk/files/%{name}_%{version}.zip
BuildRequires: gcc-c++
BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -35,48 +31,52 @@ 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 lib%{name}-%{soname}
%package -n lib%{name}-%{version}
Summary: It is an extremely flexible cross-platform scripting library
Group: System/Libraries
%description -n lib%{name}-%{soname}
%description -n lib%{name}-%{version}
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 devel
Summary: It is an extremely flexible cross-platform scripting library
Group: Development/Libraries/C and C++
Requires: lib%{name}-%{soname} = %{version}
Requires: lib%{name}-%{version} = %{version}
%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.
%prep
%setup -qn sdk
%patch1 -p1
%patch2 -p1
%setup -qn sdk/%{name}/projects/gnuc
%build
pushd angelscript/projects/gnuc/
make %{?_smp_mflags} SHARED=1 CXXFLAGS="%{optflags}" SHARED=1 VERSION=%{version}
popd
make %{?_smp_mflags} SHARED=1 VERSION=%{version}
%install
pushd angelscript/projects/gnuc/
make install DESTDIR=%{buildroot} DESTLIBDIR=%{_libdir} SHARED=1 VERSION=%{version}
popd
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_includedir}
%post -n lib%{name}-%{soname} -p /sbin/ldconfig
make install SHARED=1 VERSION=%{version} LOCAL=%{buildroot}%{_prefix} INSTALL_LIBDIR=%{_lib}
%postun -n lib%{name}-%{soname} -p /sbin/ldconfig
# Fix Symlink points to BuildRoot
rm %{buildroot}%{_libdir}/libangelscript.so
ln -s %{_libdir}/libangelscript-%{version}.so %{buildroot}%{_libdir}/libangelscript.so
%files -n lib%{name}-%{soname}
rm %{buildroot}%{_libdir}/libangelscript.so.%{version}
ln -s %{_libdir}/libangelscript-%{version}.so %{buildroot}%{_libdir}/libangelscript.so.%{version}
%post -n lib%{name}-%{version} -p /sbin/ldconfig
%postun -n lib%{name}-%{version} -p /sbin/ldconfig
%files -n lib%{name}-%{version}
%defattr(-,root,root)
%{_libdir}/libangelscript-%{version}.so
%{_libdir}/libangelscript.so.*
%{_libdir}/libangelscript-*.so
%files devel
%defattr(-,root,root)
%{_includedir}/*.h
%attr(0644,root,root) %{_includedir}/*.h
%{_libdir}/libangelscript.so
%doc docs/manual/
%changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:84f2befc22f0541becf987519f6dc3d5dd561547bb5e6219327374ead0d516eb
size 1232872

3
angelscript_2.29.2.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c5d549bcd2d04e0dbdfdeea1e1446a34bc9dc449efe0d6fb7fabfb98ee269a8b
size 1583192

View File

@ -1,29 +0,0 @@
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-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
# 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
@@ -122,13 +122,13 @@
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: