rpms/ufoai/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 ufoai.spec, 1.11, 1.12 ufoai-2.3-no-lua.patch, 1.1, NONE ufoai-2.3-radiant-ldl.patch, 1.1, NONE ufoai-2.3.1-gcc47.patch, 1.1, NONE ufoai-2.3.1-glib.patch, 1.1, NONE ufoai-2.3.1-radiant-apppath.patch, 1.1, NONE ufoai-2.3.1-zpng.patch, 1.1, NONE

Karel Volný kvolny at rpmfusion.org
Sun Jul 1 13:17:31 CEST 2012 

Author: kvolny

Update of /cvs/nonfree/rpms/ufoai/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv549

Modified Files:
	.cvsignore sources ufoai.spec 
Removed Files:
	ufoai-2.3-no-lua.patch ufoai-2.3-radiant-ldl.patch 
	ufoai-2.3.1-gcc47.patch ufoai-2.3.1-glib.patch 
	ufoai-2.3.1-radiant-apppath.patch ufoai-2.3.1-zpng.patch 
Log Message:
* Fri Jun 29 2012 Karel Volny <kvolny at redhat.com> 2.4-1
- Version bump
- Changelog: http://ufoai.org/wiki/index.php/Changelog/2.4
- Fixed duplicate packaging of md2tag_export.py
- Added ufoslicer to -tools



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Mar 2011 14:13:50 -0000	1.4
+++ .cvsignore	1 Jul 2012 11:17:30 -0000	1.5
@@ -1 +1 @@
-ufoai-2.3.1-source.tar.bz2
+ufoai-2.4-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Mar 2011 14:13:51 -0000	1.4
+++ sources	1 Jul 2012 11:17:30 -0000	1.5
@@ -1 +1 @@
-87b3e1bf3439dc6e5413936034f47d17  ufoai-2.3.1-source.tar.bz2
+d7e88aee0ea94149c8b9d90eb6c21ba9  ufoai-2.4-source.tar.bz2


Index: ufoai.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ufoai.spec	15 May 2012 22:35:24 -0000	1.11
+++ ufoai.spec	1 Jul 2012 11:17:30 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		ufoai
-Version:	2.3.1
-Release:	5%{?dist}
+Version:	2.4
+Release:	1%{?dist}
 Summary:	UFO: Alien Invasion
 
 Group:		Amusements/Games
@@ -9,13 +9,7 @@
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.bz2
 Source1:	%{name}-wrapper.sh
 Source2:	uforadiant-wrapper.sh
-Patch0:		ufoai-2.3-no-lua.patch
-Patch1:		ufoai-2.3-radiant-ldl.patch
-Patch2:		ufoai-2.3-desktop-files.patch
-Patch3:		ufoai-2.3.1-radiant-apppath.patch
-Patch4:		ufoai-2.3.1-zpng.patch
-Patch5:         ufoai-2.3.1-gcc47.patch
-Patch6:		ufoai-2.3.1-glib.patch
+Patch0:		ufoai-2.3-desktop-files.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -120,30 +114,35 @@
 
 %prep
 %setup -q -n %{name}-%{version}-source
-# ufoai-2.3-no-lua.patch - disable bundled lua
-%patch0 -p0
-# ufoai-2.3-radiant-ldl.patch - add 'ldl' to RADIANT_LIBS
-# need to use fuzz, the Makefile has changed since 2.3
-%patch1 -F2 -p0
 # ufoai-2.3-desktop-files.patch - fix executable and icon names
-%patch2 -p0
-# ufoai-2.3.1-radiant-apppath.patch - fix test for appPath
-%patch3 -p0
-## we do not like "arch-dependent-file" in /usr/share
-# change the target for the library
-sed -i -e "s/base/./" build/game.mk
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .glib
+%patch0 -p0
+# maps and models are in ufoai-data package, do not try to build them
+sed -i -e "/maps.mk/d" Makefile
+sed -i -e "/models.mk/d" Makefile
+# we don't use any of the installers
+sed -i -e "/install.mk/d" Makefile
 
 
 %build
-%configure --enable-release
+# don't use %%configure, UFOAI doesn't like default configure options
+./configure \
+	--disable-dependency-tracking \
+	--prefix=%{_prefix} \
+	--bindir=%{_bindir} \
+	--datadir=%{_datadir}/%{name} \
+	--libdir=%{_libdir}/%{name} \
+	--localedir=%{_datarootdir}/locale \
+	--enable-ufoded \
+	--enable-uforadiant \
+	--enable-ufo2map \
+	--enable-ufomodel \
+	--enable-release
+
 make %{?_smp_mflags}
 make %{?_smp_mflags} lang
 
 # build documentation
-make %{?_smp_mflags} pdf-manual
+make %{?_smp_mflags} manual
 
 # build uforadiant
 make %{?_smp_mflags} uforadiant
@@ -166,12 +165,11 @@
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications debian/ufoai.desktop
 
 ## install common
-install -D -m 0755 game.so %{buildroot}%{_libdir}/%{name}/game.so
+install -D -m 0755 base/game.so %{buildroot}%{_libdir}/%{name}/game.so
 
 ## install doc
 mkdir -p -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
-cp -pr README COPYING src/docs/tex/*.pdf \
-	%{buildroot}%{_docdir}/%{name}-%{version}/
+cp -pr README COPYING src/docs/tex/*.pdf %{buildroot}%{_docdir}/%{name}-%{version}/
 
 ## install server
 install -D -m 0755 ufoded %{buildroot}%{_bindir}
@@ -183,6 +181,7 @@
 install -D -m 0755 ufo2map %{buildroot}%{_bindir}
 install -D -m 0644 debian/ufo2map.6 %{buildroot}%{_mandir}/man6/ufo2map.6
 install -D -m 0755 ufomodel %{buildroot}%{_bindir}
+install -D -m 0755 ufoslicer %{buildroot}%{_bindir}
 install -D src/tools/blender/md2tag_export.py %{buildroot}%{_datadir}/%{name}/tools/md2tag_export.py
 # not available in our sources
 #install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufo2map
@@ -192,12 +191,11 @@
 install -D -m 0755 radiant/uforadiant %{buildroot}%{_bindir}/uforadiant
 install -p -m 0755 %{SOURCE2} %{buildroot}%{_bindir}
 install -D -m 0644 debian/uforadiant.6 %{buildroot}%{_mandir}/man6/uforadiant.6
-install -D -m 0755 radiant/plugins/brushexport.so %{buildroot}%{_libdir}/uforadiant/brushexport.so
 mkdir -p -m 0755 %{buildroot}%{_datadir}/%{name}/radiant
+cp -p radiant/*.xml %{buildroot}%{_datadir}/%{name}/radiant/
+cp -p radiant/mapdef.template %{buildroot}%{_datadir}/%{name}/radiant/
 cp -pr radiant/bitmaps %{buildroot}%{_datadir}/%{name}/radiant
-cp -pr radiant/games %{buildroot}%{_datadir}/%{name}/radiant
 cp -pr radiant/prefabs %{buildroot}%{_datadir}/%{name}/radiant
-cp -pr radiant/shaders %{buildroot}%{_datadir}/%{name}/radiant
 cp -pr radiant/sourceviewer %{buildroot}%{_datadir}/%{name}/radiant
 cp -pr radiant/i18n/* %{buildroot}%{_datadir}/locale/
 %find_lang uforadiant
@@ -290,6 +288,7 @@
 %defattr(-,root,root,-)
 %{_bindir}/ufo2map
 %{_bindir}/ufomodel
+%{_bindir}/ufoslicer
 %dir %{_datadir}/%{name}/
 # not available in our sources
 #%%{_sysconfdir}/bash_completion.d/
@@ -304,12 +303,16 @@
 %{_datadir}/applications/uforadiant.desktop
 %{_datadir}/icons/hicolor/32x32/apps/uforadiant.xpm
 %{_datadir}/%{name}/radiant/
-%{_libdir}/uforadiant/
 %doc %{_mandir}/man6/uforadiant.6*
-%{_datadir}/%{name}/tools/md2tag_export.py
 
 
 %changelog
+* Fri Jun 29 2012 Karel Volny <kvolny at redhat.com> 2.4-1
+- Version bump
+- Changelog: http://ufoai.org/wiki/index.php/Changelog/2.4
+- Fixed duplicate packaging of md2tag_export.py
+- Added ufoslicer to -tools
+
 * Tue May 15 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.3.1-5
 - Fix FTBFS
 


--- ufoai-2.3-no-lua.patch DELETED ---


--- ufoai-2.3-radiant-ldl.patch DELETED ---


--- ufoai-2.3.1-gcc47.patch DELETED ---


--- ufoai-2.3.1-glib.patch DELETED ---


--- ufoai-2.3.1-radiant-apppath.patch DELETED ---


--- ufoai-2.3.1-zpng.patch DELETED ---

More information about the rpmfusion-commits mailing list