- update to 1.9.0-beta6.4, builds

Changed files:
    doomsday-ac.patch -> 1.2
    doomsday-ncurses.patch -> 1.2
    doomsday-runtimedir.patch -> 1.3
    doomsday.spec -> 1.17

diff --git a/doomsday-ac.patch b/doomsday-ac.patch
deleted file mode 100644 (file)
index 42cb616..0000000
--- a/doomsday-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- deng-1.9.0-beta4/configure.ac.orig 2006-09-01 17:30:14.000000000 +0200
-+++ deng-1.9.0-beta4/configure.ac      2006-09-01 17:33:59.216224250 +0200
-@@ -124,10 +124,8 @@
-       Src/dpDehRead/Makefile Src/dpMapLoad/Makefile
-       Src/dsSDLMixer/Makefile Src/dsOpenAL/Makefile ])
- 
--cd ..
- rm -f ./Data/Doomsday.pk3
- zip -v -0  ./Data/Doomsday.pk3  ./Data/Graphics/* ./Data/Fonts/* ./Data/KeyMaps/*
--cd Build
- 
- #cd ..
- #python ./Scripts/makedmt.py < ./Include/mapdata.hs

diff --git a/doomsday-ncurses.patch b/doomsday-ncurses.patch
deleted file mode 100644 (file)
index 86ceb89..0000000
--- a/doomsday-ncurses.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- deng-1.8.3.orig/configure.ac       2004-10-19 16:10:54.000000000 +0200
-+++ deng-1.8.3/configure.ac    2004-10-30 01:00:38.248519448 +0200
-@@ -57,7 +57,7 @@
- dnl   ])
- 
- dnl Check that the required libraries are available.
--AC_CHECK_HEADER(curses.h,
-+AC_CHECK_HEADER(ncurses/curses.h,
-       [USELESS_VAR=1],
-       AC_MSG_ERROR([*** curses not found!]))
- 
---- deng-1.8.3.orig/Src/Makefile.am    2004-10-19 15:50:52.000000000 +0200
-+++ deng-1.8.3/Src/Makefile.am 2004-10-30 01:15:19.003624320 +0200
-@@ -2,7 +2,7 @@
- 
- bin_PROGRAMS = doomsday
- 
--INCLUDES = -I$(top_srcdir)/Include
-+INCLUDES = -I$(top_srcdir)/Include -I/usr/include/ncurses
- DEFS = -DUNIX -D@FIXED_IMPL@ -D__DOOMSDAY__ -DNORANGECHECKING    \
- -DDENG_LIBRARY_DIR=\"$(libdir)\" -DDENG_BASE_DIR=\"$(pkgdatadir)\"
- doomsday_CFLAGS = @SDL_CFLAGS@ $(LTDLINCL)

diff --git a/doomsday-runtimedir.patch b/doomsday-runtimedir.patch
deleted file mode 100644 (file)
index 37bfe25..0000000
--- a/doomsday-runtimedir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./Src/dd_main.c~   2005-04-10 18:52:35.000000000 +0300
-+++ ./Src/dd_main.c    2005-04-10 18:52:37.000000000 +0300
-@@ -275,6 +275,16 @@
- 
-     DD_Verbosity();
- 
-+#ifdef UNIX
-+    if (getenv("HOME")) {
-+        filename_t h;
-+        sprintf(h, "%s/.doomsday", getenv("HOME"));
-+        M_CheckPath(h);
-+        Dir_MakeDir(h, &ddRuntimeDir);
-+        userdir_ok = Dir_ChDir(&ddRuntimeDir);
-+    }
-+#endif
-+
-     // The -userdir option sets the working directory.
-     if(ArgCheckWith("-userdir", 1))
-     {

diff --git a/doomsday.spec b/doomsday.spec
index e335c23485a1503e667cee4bcd2f225b62355ed1..03df7662d86edd8a1f51f562167c455eff5b54f2 100644 (file)
--- a/doomsday.spec
+++ b/doomsday.spec
@@ -1,21 +1,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
@@ -24,15 +21,12 @@ BuildRequires:      SDL_mixer-devel
 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.
 
@@ -40,24 +34,22 @@ jDoom, jHeretic and jHexen for Linux.
 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
@@ -99,13 +91,10 @@ Encoding=UTF-8
 # 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
@@ -117,13 +106,13 @@ if [ "$1" = "1" ]; then
 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