packages: doomsday/doomsday.spec, doomsday/doomsday-ac.patch (REMOVED), doo...

[glen]

Author: glen                         Date: Fri Jul 24 21:39:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update to 1.9.0-beta6.4, builds

---- Files affected:
packages/doomsday:
   doomsday.spec (1.16 -> 1.17) , doomsday-ac.patch (1.1 -> NONE)  (REMOVED), doomsday-ncurses.patch (1.1 -> NONE)  (REMOVED), doomsday-runtimedir.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/doomsday/doomsday.spec
diff -u packages/doomsday/doomsday.spec:1.16 packages/doomsday/doomsday.spec:1.17
--- packages/doomsday/doomsday.spec:1.16	Mon Feb 12 22:23:53 2007
+++ packages/doomsday/doomsday.spec	Fri Jul 24 23:39:49 2009
@@ -2,21 +2,18 @@
 # TODO
 # - icons for desktop files
 # - (CVE-2006-1618) http://security.gentoo.org/glsa/glsa-200604-05.xml
-#
-%define		_beta beta4
-#
+
+%define		subver	beta6.4
+%define		rel		0.1
 Summary:	jDoom, jHeretic and jHexen for Linux
 Summary(pl.UTF-8):	jDoom, jHeretic i jHexen dla Linuksa
 Name:		doomsday
 Version:	1.9.0
-Release:	0.%{_beta}.1
+Release:	0.%{subver}.%{rel}
 License:	GPL v2
 Group:		Applications/Games
-Source0:	http://dl.sourceforge.net/deng/deng-%{version}-%{_beta}.tar.gz
-# Source0-md5:	b2bec9a475eee1438f55ebde00b3d13f
-Patch0:		%{name}-ncurses.patch
-Patch1:		%{name}-runtimedir.patch
-Patch2:		%{name}-ac.patch
+Source0:	http://dl.sourceforge.net/deng/deng-%{version}-%{subver}.tar.gz
+# Source0-md5:	63fdbc11f0473535f7206f62952a1e2e
 URL:		http://www.doomsdayhq.com/
 BuildRequires:	OpenAL-devel
 BuildRequires:	OpenGL-devel
@@ -25,15 +22,12 @@
 BuildRequires:	SDL_net-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	cmake >= 2.4
 BuildRequires:	rpmbuild(macros) >= 1.213
-Requires(post):	/sbin/ldconfig
-Requires:		TiMidity++
-# it's FUBAR by storing pointers in int struct fields
-ExcludeArch:	%{x8664} alpha ia64 ppc64 s390x sparc64
+BuildRequires:	zip
+Requires:	TiMidity++
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreqdep	libGL.so.1 libGLU.so.1
-
 %description
 jDoom, jHeretic and jHexen for Linux.
 
@@ -41,24 +35,22 @@
 jDoom, jHeretic i jHexen dla Linuksa.
 
 %prep
-%setup -q -n deng-%{version}-%{_beta}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n deng-%{version}-%{subver}
 
 %build
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-
-%configure
+install -d build
+cd build
+%cmake \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCURSES_INCLUDE_PATH=/usr/include/ncurses \
+	../doomsday
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_desktopdir}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 cat <<EOF > $RPM_BUILD_ROOT%{_desktopdir}/%{name}-doom.desktop
@@ -100,13 +92,10 @@
 # vi: encoding=utf-8
 EOF
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 if [ "$1" = "1" ]; then
 	%banner -e %{name} <<-EOF
 	To run doomsday you need some WAD file: either freedoom package
@@ -118,14 +107,14 @@
 EOF
 fi
 
-%postun -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
-%doc Doc/*
 %attr(755,root,root) %{_bindir}/doomsday
-%attr(755,root,root) %{_libdir}/*.so.*.*.*
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libdpdehread.so
+%attr(755,root,root) %{_libdir}/libdpwadmapconverter.so
+%attr(755,root,root) %{_libdir}/libjdoom.so
+%attr(755,root,root) %{_libdir}/libjheretic.so
+%attr(755,root,root) %{_libdir}/libjhexen.so
 %{_datadir}/deng
 %{_desktopdir}/*.desktop
 
@@ -135,6 +124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2009/07/24 21:39:49  glen
+- update to 1.9.0-beta6.4, builds
+
 Revision 1.16  2007/02/12 21:23:53  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doomsday/doomsday.spec?r1=1.16&r2=1.17&f=u