1:15 p.m.
Author: kvolny
Update of /cvs/nonfree/rpms/ufoai/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17411
Modified Files:
.cvsignore sources ufoai.spec
Added Files:
ufoai-2.3-desktop-files.patch ufoai-2.3-libdir.patch
ufoai-2.3-no-lua.patch ufoai-2.3-radiant-ldl.patch
ufoai-wrapper.sh uforadiant-wrapper.sh
Removed Files:
ufoai-2.2-libdir.patch
Log Message:
* Tue Sep 14 2010 Karel Volny <kvolny(a)redhat.com> 2.3-1
- Version bump
- Fixes RPMFusion bug #1305
- Adjusted BuildRequires
- Split Radiant (the map editor), tools, server and common subpackages
- Install manpages and other goodies from debian subdirectory
- Removed ufoded wrapper, no longer needed
ufoai-2.3-desktop-files.patch:
ufoai.desktop | 4 ++--
ufoded.desktop | 4 ++--
uforadiant.desktop | 7 +++----
3 files changed, 7 insertions(+), 8 deletions(-)
--- NEW FILE ufoai-2.3-desktop-files.patch ---
--- debian/ufoai.desktop~ 2010-05-14 19:16:22.000000000 +0200
+++ debian/ufoai.desktop 2010-08-17 19:19:42.686336614 +0200
@@ -5,8 +5,8 @@
GenericName=UFO: Alien Invasion
Comment=Turn-based tactical combat against hostile alien forces
Comment[de_DE]=Rundenbasiertes Taktikspiel
-Exec=/usr/games/ufo
-Icon=ufoai.xpm
+Exec=ufoai-wrapper.sh
+Icon=ufoai
Terminal=false
Type=Application
Categories=Application;Game;StrategyGame;
--- debian/ufoded.desktop~ 2010-05-14 19:16:22.000000000 +0200
+++ debian/ufoded.desktop 2010-08-17 19:19:37.134336759 +0200
@@ -5,8 +5,8 @@
GenericName=UFO: AI Dedicated Server
Comment=Turn-based tactical combat against hostile alien forces (server)
Comment[de_DE]=Rundenbasiertes Taktikspiel (Server)
-Exec=/usr/games/ufoded
-Icon=ufoded.xpm
+Exec=ufoded
+Icon=ufoded
Terminal=true
Type=Application
Categories=Application;Game;StrategyGame;
--- debian/uforadiant.desktop~ 2010-05-14 19:16:22.000000000 +0200
+++ debian/uforadiant.desktop 2010-08-17 19:19:58.767336033 +0200
@@ -5,11 +5,10 @@
GenericName=UFORadiant
Comment=Map Editor for UFO: Alien Invasion
Comment[de_DE]=Map Editor für UFO: Alien Invasion
-Exec=/usr/games/uforadiant
-Icon=uforadiant.xpm
+Exec=uforadiant-wrapper.sh
+Icon=uforadiant
Terminal=false
-StartupNotify=false
Type=Application
-Categories=Application;Game;StrategyGame;GTK;3DGraphics
+Categories=Application;Game;StrategyGame;GTK;Graphics;3DGraphics
MimeType=application/x-ufomap
StartupNotify=true
ufoai-2.3-libdir.patch:
unix_main.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
--- NEW FILE ufoai-2.3-libdir.patch ---
--- src/ports/unix/unix_main.c~ 2010-05-14 19:16:34.000000000 +0200
+++ src/ports/unix/unix_main.c 2010-09-14 09:04:55.035394517 +0200
@@ -366,6 +366,26 @@
#ifndef HARD_LINKED_GAME
Com_Printf("------- Loading game.%s -------\n", SHARED_EXT);
+#ifdef PKGLIBDIR
+ /* first try the system library path */
+ Com_sprintf(name, sizeof(name),
PKGLIBDIR"/game_"CPUSTRING"."SHARED_EXT);
+ Com_DPrintf(DEBUG_SYSTEM, "LoadLibrary: try %s\n", name);
+ game_library = dlopen(name, RTLD_LAZY);
+ if (game_library) {
+ Com_Printf("LoadLibrary (%s)\n", name);
+ } else {
+ Com_DPrintf(DEBUG_SYSTEM, "%s\n", dlerror());
+ Com_sprintf(name, sizeof(name), PKGLIBDIR"/game."SHARED_EXT);
+ Com_DPrintf(DEBUG_SYSTEM, "LoadLibrary: try %s\n", name);
+ game_library = dlopen(name, RTLD_LAZY);
+ if (game_library) {
+ Com_Printf("LoadLibrary (%s)\n", name);
+ } else {
+ Com_DPrintf(DEBUG_SYSTEM, "%s\n", dlerror());
+ }
+ }
+#endif
+
/* now run through the search paths */
path = NULL;
while (!game_library) {
ufoai-2.3-no-lua.patch:
Makefile.in | 2 +-
build/game.mk | 33 +--------------------------------
2 files changed, 2 insertions(+), 33 deletions(-)
--- NEW FILE ufoai-2.3-no-lua.patch ---
--- build/game.mk~ 2010-06-13 09:47:44.000000000 +0200
+++ build/game.mk 2010-07-20 18:28:01.709381425 +0200
@@ -29,38 +29,7 @@
game/g_svcmds.c \
game/g_trigger.c \
game/g_utils.c \
- game/g_vis.c \
- \
- game/lua/lapi.c \
- game/lua/lauxlib.c \
- game/lua/lbaselib.c \
- game/lua/lcode.c \
- game/lua/ldblib.c \
- game/lua/ldebug.c \
- game/lua/ldo.c \
- game/lua/ldump.c \
- game/lua/lfunc.c \
- game/lua/lgc.c \
- game/lua/linit.c \
- game/lua/liolib.c \
- game/lua/llex.c \
- game/lua/lmathlib.c \
- game/lua/lmem.c \
- game/lua/loadlib.c \
- game/lua/lobject.c \
- game/lua/lopcodes.c \
- game/lua/loslib.c \
- game/lua/lparser.c \
- game/lua/lstate.c \
- game/lua/lstring.c \
- game/lua/lstrlib.c \
- game/lua/ltable.c \
- game/lua/ltablib.c \
- game/lua/ltm.c \
- game/lua/lundump.c \
- game/lua/lvm.c \
- game/lua/lzio.c \
- game/lua/print.c
+ game/g_vis.c
ifneq ($(HARD_LINKED_GAME),1)
GAME_SRCS+= \
--- Makefile.in~ 2010-05-14 19:27:14.000000000 +0200
+++ Makefile.in 2010-09-14 13:52:12.144729441 +0200
@@ -25,7 +25,7 @@
CLIENT_LIBS=@CLIENT_LIBS@
SERVER_LIBS=@SERVER_LIBS@
-GAME_LIBS=@GAME_LIBS@
+GAME_LIBS=@GAME_LIBS@ -llua -ldl
TOOLS_LIBS=@TOOLS_LIBS@
RADIANT_LIBS=@RADIANT_LIBS@
ufoai-2.3-radiant-ldl.patch:
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ufoai-2.3-radiant-ldl.patch ---
--- Makefile.in~ 2010-05-14 19:27:14.000000000 +0200
+++ Makefile.in 2010-08-17 18:56:18.668399207 +0200
@@ -27,7 +27,7 @@
SERVER_LIBS=@SERVER_LIBS@
GAME_LIBS=@GAME_LIBS@ -llua -ldl
TOOLS_LIBS=@TOOLS_LIBS@
-RADIANT_LIBS=@RADIANT_LIBS@
+RADIANT_LIBS=@RADIANT_LIBS@ -ldl
RADIANT_CFLAGS=@RADIANT_CFLAGS@
--- NEW FILE ufoai-wrapper.sh ---
#!/bin/sh
. /usr/share/opengl-games-utils/opengl-game-functions.sh
checkDriOK UFO:AI
exec ufo \
+set fs_i18ndir /usr/share/locale \
"\$@"
--- NEW FILE uforadiant-wrapper.sh ---
#!/bin/sh
. /usr/share/opengl-games-utils/opengl-game-functions.sh
checkDriOK UFO:AI
exec uforadiant "\$@"
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Aug 2008 18:35:22 -0000 1.2
+++ .cvsignore 14 Sep 2010 13:15:45 -0000 1.3
@@ -1 +1 @@
-ufoai-2.2.1-source.tar.bz2
+ufoai-2.3-source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Aug 2008 18:35:22 -0000 1.2
+++ sources 14 Sep 2010 13:15:45 -0000 1.3
@@ -1 +1 @@
-d3d1e45056fe87efbd9a0f000779ab17 ufoai-2.2.1-source.tar.bz2
+9d180ed896a58fe0e514601cd7637dc1 ufoai-2.3-source.tar.bz2
Index: ufoai.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ufoai.spec 29 Mar 2009 15:21:05 -0000 1.4
+++ ufoai.spec 14 Sep 2010 13:15:45 -0000 1.5
@@ -1,25 +1,42 @@
Name: ufoai
-Version: 2.2.1
-Release: 4%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Summary: UFO: Alien Invasion
Group: Amusements/Games
License: GPLv2+
URL: http://ufoai.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.bz2
-Source1: %{name}.desktop
-Source2: %{name}-ded.desktop
-Patch: ufoai-2.2-libdir.patch
+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-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils curl-devel freealut-devel gettext
-BuildRequires: libjpeg-devel libogg-devel libpng-devel libvorbis-devel
-BuildRequires: libXxf86dga-devel libXxf86vm-devel SDL-devel SDL_mixer-devel
+BuildRequires: libjpeg-devel libogg-devel libpng-devel
+BuildRequires: libtheora-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libXxf86dga-devel libXxf86vm-devel
+BuildRequires: lua-devel
+BuildRequires: SDL-devel
+BuildRequires: SDL_image-devel
+BuildRequires: SDL_mixer-devel
BuildRequires: SDL_ttf-devel
+# in RPMFusion-free; substituted with libtheora-devel
+#BuildRequires: xvidcore-devel
Requires: opengl-games-utils
+Requires: %{name}-common = %{version}
Requires: %{name}-data = %{version}
+Requires: %{name}-data-server = %{version}
+
+
+%package common
+Summary: UFO: Alien Invasion shared files
%package doc
@@ -29,6 +46,25 @@
BuildRequires: tetex-latex
+%package server
+Summary: UFO: Alien Invasion dedicated server
+Requires: %{name}-data-server = %{version}
+Requires: %{name}-common = %{version}
+
+
+%package tools
+Summary: UFO: Alien Invasion developer tools
+Group: Development/Tools
+
+
+%package uforadiant
+Summary: UFO: Alien Invasion map editor
+Group: Development/Tools
+BuildRequires: gtkglext-devel
+BuildRequires: gtksourceview2-devel
+Requires: %{name}-ufo2map
+
+
%description
UFO: ALIEN INVASION is a strategy game featuring tactical combat
against hostile alien forces which are about to infiltrate earth at
@@ -39,6 +75,14 @@
about their technology, their goals and the aliens themselves.
+%description common
+UFO: ALIEN INVASION is a strategy game featuring tactical combat
+against hostile alien forces which are about to infiltrate earth at
+this very moment.
+
+This package contains files common both to the client and the server.
+
+
%description doc
UFO: ALIEN INVASION is a strategy game featuring tactical combat
against hostile alien forces which are about to infiltrate earth at
@@ -47,71 +91,115 @@
This package contains the user manual for the game.
+%description server
+UFO: ALIEN INVASION is a strategy game featuring tactical combat
+against hostile alien forces which are about to infiltrate earth at
+this very moment.
+
+This package contains the UFO:AI dedicated server.
+
+
+%description tools
+UFO: ALIEN INVASION is a strategy game featuring tactical combat
+against hostile alien forces which are about to infiltrate earth at
+this very moment.
+
+This package contains the developer tools.
+
+
+%description uforadiant
+UFO: ALIEN INVASION is a strategy game featuring tactical combat
+against hostile alien forces which are about to infiltrate earth at
+this very moment.
+
+This package contains the UFORadiant map editor.
+
+
%prep
%setup -q -n %{name}-%{version}-source
+# allow to set the library path
+#%patch -p1
+# ufoai-2.3-no-lua.patch - disable bundled lua
+%patch0 -p0
+# ufoai-2.3-radiant-ldl.patch - add 'ldl' to RADIANT_LIBS
+%patch1 -p0
+# ufoai-2.3-desktop-files.patch - fix executable and icon names
+%patch2 -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
-# allow to set the library path
-%patch -p1
+# ufoai-2.3-libdir.patch - search for the library within system library path
+%patch3 -p0
%build
-%configure --disable-ufo2map --enable-release
+#%configure --disable-ufo2map --disable-uforadiant --enable-release
+%configure --enable-release
make %{?_smp_mflags}
make %{?_smp_mflags} lang
-# wrapper scripts - generated because we need arch dependent paths
-cat > %{name}-wrapper.sh <<-EOF
-#!/bin/sh
-
-. /usr/share/opengl-games-utils/opengl-game-functions.sh
-
-checkDriOK UFO:AI
-
-exec ufo \\
- +set fs_libdir %{_libdir}/%{name} \\
- +set fs_basedir %{_datadir}/%{name} \\
- +set fs_i18ndir %{_datadir}/locale \\
- "\$@"
-EOF
-
-cat > ufoded-wrapper.sh <<-EOF
-#!/bin/sh
-
-exec ufoded \\
- +set fs_libdir %{_libdir}/%{name} \\
- +set fs_basedir %{_datadir}/%{name} \\
- +set fs_i18ndir %{_datadir}/locale \\
- "\$@"
-EOF
# build documentation
-cd src/docs/tex
-make %{?_smp_mflags}
+make %{?_smp_mflags} pdf-manual
+
+# build uforadiant
+make %{?_smp_mflags} uforadiant
%install
rm -rf %{buildroot}
+# we don't use
+# make install_exec DESTDIR=%{buildroot}
+# simply because it does not work ...
+
+## client
install -D -m 0755 ufo %{buildroot}%{_bindir}/ufo
-install -D -m 0755 ufoded %{buildroot}%{_bindir}
-install -p -m 0755 %{name}-wrapper.sh %{buildroot}%{_bindir}
-install -p -m 0755 ufoded-wrapper.sh %{buildroot}%{_bindir}
-install -D -m 0755 game.so %{buildroot}%{_libdir}/%{name}/game.so
+install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}
+install -D -m 0644 debian/ufo.6 %{buildroot}%{_mandir}/man6/ufo.6
mkdir -p -m 0755 %{buildroot}%{_datadir}/locale
cp -pr base/i18n/* %{buildroot}%{_datadir}/locale/
-mkdir -p -m 0755 %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-cp -p src/ports/linux/ufo.png
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-cp -p src/ports/linux/ufoded.png
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}-ded.png
-desktop-file-install --vendor="fedora" \
- --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
-desktop-file-install --vendor="fedora" \
- --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%find_lang %{name}
-# install documentation
+install -D -m 0644 debian/%{name}.xpm
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications debian/ufoai.desktop
+
+## install common
+install -D -m 0755 game.so %{buildroot}%{_libdir}/%{name}/game.so
+
+## install doc
mkdir -p -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
-cp -pr README CONTRIBUTORS COPYING src/docs/tex/*.pdf \
+cp -pr README COPYING src/docs/tex/*.pdf \
%{buildroot}%{_docdir}/%{name}-%{version}/
+## install server
+install -D -m 0755 ufoded %{buildroot}%{_bindir}
+install -D -m 0644 debian/ufoded.6 %{buildroot}%{_mandir}/man6/ufoded.6
+install -D -m 0644 debian/ufoded.xpm
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/ufoded.xpm
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications debian/ufoded.desktop
+
+## install tools
+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 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
+#install -D -m 0644 contrib/scripts/bashcompletion/ufomodel
%{buildroot}%{_sysconfdir}/bash_completion.d/ufomodel
+
+## install uforadiant
+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}/uforadiant
+cp -pr radiant/bitmaps %{buildroot}%{_datadir}/uforadiant
+cp -pr radiant/games %{buildroot}%{_datadir}/uforadiant
+cp -pr radiant/prefabs %{buildroot}%{_datadir}/uforadiant
+cp -pr radiant/shaders %{buildroot}%{_datadir}/uforadiant
+cp -pr radiant/sourceviewer %{buildroot}%{_datadir}/uforadiant
+cp -pr radiant/i18n/* %{buildroot}%{_datadir}/locale/
+%find_lang uforadiant
+install -D -m 0644 debian/uforadiant.xpm
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/uforadiant.xpm
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications
debian/uforadiant.desktop
+
%clean
rm -rf %{buildroot}
@@ -124,6 +212,20 @@
fi
+%post server
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%post uforadiant
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
%postun
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -131,29 +233,88 @@
fi
+%postun server
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun uforadiant
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
%files -f %{name}.lang
%defattr(-,root,root,-)
# we need to use full path so %doc does not the cleanup
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/README
-%doc %{_docdir}/%{name}-%{version}/CONTRIBUTORS
%doc %{_docdir}/%{name}-%{version}/COPYING
-%{_bindir}/*
+%{_bindir}/ufo
+%{_bindir}/ufoai-wrapper.sh
+%{_datadir}/applications/ufoai.desktop
+%{_datadir}/icons/hicolor/32x32/apps/ufoai.xpm
+%doc %{_mandir}/man6/ufo.6*
+
+
+%files common
+%defattr(-,root,root,-)
%{_libdir}/%{name}/
-%{_datadir}/applications/*
%dir %{_datadir}/icons/hicolor/
%dir %{_datadir}/icons/hicolor/32x32/
-%{_datadir}/icons/hicolor/32x32/apps/
+%dir %{_datadir}/icons/hicolor/32x32/apps/
%files doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/*.pdf
-%lang(en) %{_docdir}/%{name}-%{version}/ufo-manual_EN.pdf
+#%doc %{_docdir}/%{name}-%{version}/*.pdf
+%lang(en) %doc %{_docdir}/%{name}-%{version}/ufo-manual_EN.pdf
+
+
+%files server
+%defattr(-,root,root,-)
+%{_bindir}/ufoded
+%{_datadir}/applications/ufoded.desktop
+%{_datadir}/icons/hicolor/32x32/apps/ufoded.xpm
+%doc %{_mandir}/man6/ufoded.6*
+
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/ufo2map
+%{_bindir}/ufomodel
+%dir %{_datadir}/%{name}/
+# not available in our sources
+#%{_sysconfdir}/bash_completion.d/
+%doc %{_mandir}/man6/ufo2map.6*
+%{_datadir}/%{name}/tools/
+
+
+%files uforadiant -f uforadiant.lang
+%defattr(-,root,root,-)
+%{_bindir}/uforadiant
+%{_bindir}/uforadiant-wrapper.sh
+%{_datadir}/applications/uforadiant.desktop
+%{_datadir}/icons/hicolor/32x32/apps/uforadiant.xpm
+%{_datadir}/uforadiant/
+%{_libdir}/uforadiant/
+%doc %{_mandir}/man6/uforadiant.6*
+%{_datadir}/%{name}/tools/md2tag_export.py
%changelog
+* Tue Sep 14 2010 Karel Volny <kvolny(a)redhat.com> 2.3-1
+- Version bump
+- Fixes RPMFusion bug #1305
+- Adjusted BuildRequires
+- Split Radiant (the map editor), tools, server and common subpackages
+- Install manpages and other goodies from debian subdirectory
+- Removed ufoded wrapper, no longer needed
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.1-4
- rebuild for new F11 features
--- ufoai-2.2-libdir.patch DELETED ---