rpms/nexuiz/devel .cvsignore, 1.14, 1.15 nexuiz.spec, 1.31, 1.32 sources, 1.14, 1.15
Jon Ciesla
limb at fedoraproject.org
Tue May 26 19:07:56 UTC 2009
Author: limb
Update of /cvs/pkgs/rpms/nexuiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9505
Modified Files:
.cvsignore nexuiz.spec sources
Log Message:
2.5.1, darkplaces, quake.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore 6 Apr 2009 15:49:01 -0000 1.14
+++ .cvsignore 26 May 2009 19:07:25 -0000 1.15
@@ -1 +1 @@
-enginesource20090403.zip
+enginesource20090501.zip
Index: nexuiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/nexuiz.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- nexuiz.spec 6 Apr 2009 15:49:01 -0000 1.31
+++ nexuiz.spec 26 May 2009 19:07:25 -0000 1.32
@@ -1,41 +1,39 @@
+%global dpver 20090501
+
Summary: Multiplayer, deathmatch oriented first person shooter
Name: nexuiz
-Version: 2.5
+Version: 2.5.1
Release: 1%{?dist}
License: GPLv2+
Group: Amusements/Games
URL: http://www.nexuiz.com/
# Source is custom, obtained with :
-# wget http://downloads.sourceforge.net/nexuiz/nexuiz-25.zip
-# unzip -j nexuiz-25.zip Nexuiz/sources/enginesource20090403.zip
-Source: enginesource20090403.zip
+# wget http://downloads.sourceforge.net/nexuiz/nexuiz-251.zip
+# unzip -j nexuiz-251.zip Nexuiz/sources/enginesource20090501.zip
+Source: enginesource%{dpver}.zip
+Source1: %{name}.desktop
+Source10: darkplaces-quake.sh
+Source11: darkplaces-quake.autodlrc
+Source12: darkplaces-quake.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# For the .ico extraction
BuildRequires: ImageMagick, file
BuildRequires: libX11-devel, alsa-lib-devel, desktop-file-utils
BuildRequires: mesa-libGL-devel libXext-devel libXxf86dga-devel
BuildRequires: libXxf86vm-devel SDL-devel libXpm-devel
-# This is necessary as these libraries are loaded during runtime
-# and therefore it isn't picked up by RPM during build
-Requires: zlib libvorbis libjpeg curl
-Requires: desktop-file-utils >= 0.9
Requires: nexuiz-data = %{version}
+Requires: darkplaces = %{dpver}-%{release}
Requires: opengl-games-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
%description
Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter,
focused on providing basic, old style deathmatches.
-
%package server
Group: Amusements/Games
Summary: Dedicated server for the Nexuiz first person shooter
Requires: nexuiz-data = %{version}
-# This is necessary as these libraries are loaded during runtime
-# and therefore it isn't picked up by RPM during build
-Requires: zlib curl
+Requires: darkplaces-server = %{dpver}-%{release}
%description server
Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter,
@@ -43,6 +41,51 @@ focused on providing basic, old style de
This is the nexuiz dedicated server required to host network games.
+%package -n darkplaces
+Summary: Modified Quake engine
+Version: %{dpver}
+Group: Amusements/Games
+# This is necessary as these libraries are loaded during runtime
+# and therefore it isn't picked up by RPM during build
+Requires: zlib libvorbis libjpeg curl
+
+%description -n darkplaces
+DarkPlaces is a modified Quake engine.
+
+%package -n darkplaces-server
+Summary: Quake engine server
+Version: %{dpver}
+Group: Amusements/Games
+# This is necessary as these libraries are loaded during runtime
+# and therefore it isn't picked up by RPM during build
+Requires: zlib curl
+
+%description -n darkplaces-server
+DarkPlaces Quake engine server.
+
+%package -n darkplaces-quake
+Summary: Multiplayer, deathmatch oriented first person shooter
+Version: %{dpver}
+Group: Amusements/Games
+Requires: autodownloader
+Requires: opengl-games-utils
+Requires: darkplaces = %{dpver}-%{release}
+
+%description -n darkplaces-quake
+Rage through levels of sheer terror and fully immersive sound and
+lighting. Arm yourself against the cannibalistic Ogre, fiendish Vore
+and indestructible Schambler using letal nails, fierce Thunderbolts
+and abominable Rocket and Grenade Launchers.
+
+%package -n darkplaces-quake-server
+Summary: Dedicated DarkPlaces Quake server
+Version: %{dpver}
+Group: Amusements/Games
+Requires: darkplaces-server = %{dpver}-%{release}
+
+%description -n darkplaces-quake-server
+DarkPlaces server required for hosting multiplayer network Quake games.
+
%prep
%setup -q -n darkplaces
@@ -52,8 +95,8 @@ This is the nexuiz dedicated server requ
%build
export DP_FS_BASEDIR=%{_datadir}/nexuiz
-%{__make} cl-nexuiz sv-nexuiz sdl-nexuiz OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=:
-convert darkplaces.ico nexuiz.png
+%{__make} %{?_smp_mflags} nexuiz OPTIM_RELEASE="$RPM_OPT_FLAGS" STRIP=:
+convert nexuiz.ico nexuiz.png
%install
@@ -67,27 +110,20 @@ convert darkplaces.ico nexuiz.png
%{buildroot}%{_bindir}/nexuiz-sdl
%{__install} -m 0755 nexuiz-dedicated \
%{buildroot}%{_bindir}/nexuiz-dedicated
+for i in glx sdl dedicated ; do
+ ln -s nexuiz-$i %{buildroot}%{_bindir}/darkplaces-$i
+done
-# Create the desktop file
-%{__cat} > %{name}.desktop << EOF
-[Desktop Entry]
-Name=Nexuiz
-Comment=Multiplayer, deathmatch oriented first person shooter
-Encoding=UTF-8
-Icon=nexuiz
-Exec=nexuiz-sdl-wrapper
-Terminal=false
-Type=Application
-EOF
-
-# Install the desktop file
+# Install the desktop files
%{__mkdir_p} %{buildroot}%{_datadir}/applications
desktop-file-install \
--vendor=fedora \
--dir %{buildroot}%{_datadir}/applications \
- --add-category ActionGame \
- --add-category Game \
- %{name}.desktop
+ %{SOURCE1}
+desktop-file-install \
+ --vendor=fedora \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{SOURCE12}
# Install all png files previously extracted from the .ico file
for file in nexuiz*.png*; do
@@ -95,39 +131,100 @@ for file in nexuiz*.png*; do
%{__install} -D -m 0644 ${file} \
%{buildroot}%{_datadir}/icons/hicolor/${res}/apps/nexuiz.png
done
+for s in 16 24 32 48 64 72 ; do
+ %{__install} -Dpm 0644 darkplaces${s}x${s}.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/darkplaces.png
+done
-ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-sdl-wrapper
+ln -s opengl-game-wrapper.sh %{buildroot}%{_bindir}/%{name}-sdl-wrapper
+ln -s opengl-game-wrapper.sh \
+ %{buildroot}%{_bindir}/darkplaces-quake-sdl-wrapper
-%post
-update-desktop-database %{_datadir}/applications 2>/dev/null || :
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+for i in glx sdl dedicated ; do
+ %{__install} -Dpm 755 %{SOURCE10} %{buildroot}%{_bindir}/darkplaces-quake-$i
+done
-%postun
-update-desktop-database %{_datadir}/applications 2>/dev/null || :
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+%{__install} -Dpm 644 %{SOURCE11} \
+ %{buildroot}%{_datadir}/darkplaces/quake.autodlrc
%clean
%{__rm} -rf %{buildroot}
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post -n darkplaces
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun -n darkplaces
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans -n darkplaces
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
%files
%defattr(-,root,root,-)
-%doc COPYING darkplaces.txt
-%{_bindir}/nexuiz-glx
-%{_bindir}/nexuiz-sdl
-%{_bindir}/%{name}-sdl-wrapper
+%{_bindir}/nexuiz-sdl-wrapper
%{_datadir}/icons/hicolor/*/apps/nexuiz.png
%{_datadir}/applications/*%{name}.desktop
%files server
%defattr(-,root,root,-)
+
+%files -n darkplaces
+%defattr(-,root,root,-)
+%doc COPYING darkplaces.txt
+%{_bindir}/darkplaces-glx
+%{_bindir}/darkplaces-sdl
+%{_bindir}/nexuiz-glx
+%{_bindir}/nexuiz-sdl
+%{_datadir}/icons/hicolor/*/apps/darkplaces.png
+
+%files -n darkplaces-server
+%defattr(-,root,root,-)
%doc COPYING darkplaces.txt
+%{_bindir}/darkplaces-dedicated
%{_bindir}/nexuiz-dedicated
+%files -n darkplaces-quake
+%defattr(-,root,root,-)
+%{_bindir}/darkplaces-quake-glx
+%{_bindir}/darkplaces-quake-sdl
+%{_bindir}/darkplaces-quake-sdl-wrapper
+%{_datadir}/darkplaces/
+%{_datadir}/applications/*darkplaces-quake.desktop
+
+%files -n darkplaces-quake-server
+%defattr(-,root,root,-)
+%doc COPYING darkplaces.txt
+%{_bindir}/darkplaces-quake-dedicated
%changelog
+* Fri May 22 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.5.1-1
+- Update to 2.5.1.
+- Split darkplaces base packages, add Quake 1 support and subpackages.
+- Bring icon cache update scriptlets up to date with current guidelines.
+- Use nexuiz icons for nexuiz instead of darkplaces ones.
+- Drop unnecessary desktop database refresh scriptlets.
+- Split nexuiz menu entry into a separate file.
+- Use parallel build.
+
* Mon Apr 06 2009 Jon Ciesla <limb at jcomserv.net> - 2.5-1
- New upstream release.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nexuiz/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 6 Apr 2009 15:49:01 -0000 1.14
+++ sources 26 May 2009 19:07:25 -0000 1.15
@@ -1 +1 @@
-085d7eb7929d990003146a90bfcd274c enginesource20090403.zip
+06e12ba8ac47f34a40eaf36e31cb6fee enginesource20090501.zip
More information about the fedora-extras-commits
mailing list