diff --git a/_service b/_service index a20094e..96cb30b 100644 --- a/_service +++ b/_service @@ -3,6 +3,7 @@ svn https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2 data/sounds/dsdg* + data/sprites/dogs* 2.5.1.5+svn%r diff --git a/clean_source.sh b/clean_source.sh deleted file mode 100644 index eae745d..0000000 --- a/clean_source.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -ex -# To be used with normal tarballs; it's replicated in _service for service downloads. -# Remove Wolfenstein dogs from source; they belong to another game -# with incompatible licensing. - -: ${DOOMWADDIR:=/usr/share/doom}; - -version=$(perl -lne 'if(/^Version\s*:\s*(\S+)/){print$1;exit}' "$i" -done -popd -find "prboom-plus-$version" -print0 | sort -z | \ - tar --no-r --null --use=xz -T- -cvf "prboom-plus-$version+.tar.xz" diff --git a/prboom-plus.spec b/prboom-plus.spec index d0f9769..ecff1b3 100644 --- a/prboom-plus.spec +++ b/prboom-plus.spec @@ -27,7 +27,6 @@ Url: http://prboom-plus.sf.net/ #SVN-Clone: https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2 #DL-URL: http://downloads.sf.net/prboom-plus/prboom-plus-2.5.1.4.tar.gz Source: prboom2-%version.tar.xz -Source2: clean_source.sh Patch1: prboom-nodatetime.diff Patch2: prboom-types1.diff Patch3: prboom-types2.diff @@ -75,7 +74,8 @@ PrBoom+ is a conservative Doom source port. It features: %patch -P 1 -P 2 -P 3 -P 5 -P 6 -P 7 -P 8 -p1 %build -cp -al data/sounds/free/*.wav data/sounds/ +cp -alv data/sounds/free/*.wav data/sounds/ +cp -alv data/sprites/free/* data/sprites/ autoreconf -fi # rpm has its own optimizations, so turn off shipped defaults %configure --enable-gl --disable-cpu-opt --program-prefix="" \ diff --git a/prboom2-2.5.1.5+svn4532.tar.xz b/prboom2-2.5.1.5+svn4532.tar.xz index 0bb205d..2d2d5a0 100644 --- a/prboom2-2.5.1.5+svn4532.tar.xz +++ b/prboom2-2.5.1.5+svn4532.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:beab681f955e75a89dcc9366ff394b1fa29c2f79e2aaf785cb180963e68e5e95 -size 1698948 +oid sha256:faebc9ebee10d34ab862d155eb3dd1e0764b168a09a4389bb10acc9d5f35f527 +size 1684780