diff --git a/schism-nodate.diff b/schism-nodate.diff new file mode 100644 index 0000000..a6f49c5 --- /dev/null +++ b/schism-nodate.diff @@ -0,0 +1,46 @@ +From: Jan Engelhardt +Upstream: never + +Replace __DATE__ and __TIME__ with static text. + +Note: rpmlint will still complain when the static date that was +encoded happens to be the current day. That is ok, since rpmlint +uses just a heuristic - excessive rebuilds should not actually +be happening. +--- + schism/version.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: schismtracker/schism/version.c +=================================================================== +--- schismtracker.orig/schism/version.c ++++ schismtracker/schism/version.c +@@ -100,6 +100,10 @@ Note: this is a hack, it'd be great to h + Fortunately, most of this should be able to be optimized down to static assignment. + */ + ++/* update whenever you checkout */ ++#define __HG_DATE__ "Apr 9 2011" ++#define __HG_TIME__ "00:00:00" /* screw this */ ++ + static int get_version_tm(struct tm *version) + { + char *ret; +@@ -119,7 +123,7 @@ static int get_version_tm(struct tm *ver + return 1; + /* Argh. */ + memset(version, 0, sizeof(*version)); +- ret = strptime(__DATE__, "%b %e %Y", version); ++ ret = strptime(__HG_DATE__, "%b %e %Y", version); + if (ret && !*ret) + return 1; + /* Give up; we don't know anything. */ +@@ -152,7 +156,7 @@ void ver_init(void) + #endif + snprintf(top_banner_normal, sizeof(top_banner_normal) - 1, + "Schism Tracker %s built %s %s", +- ver, __DATE__, __TIME__); ++ ver, __HG_DATE__, __HG_TIME__); + top_banner_normal[sizeof(top_banner_normal) - 1] = '\0'; /* to be sure */ + } + diff --git a/schismtracker-0.20100224.tar.bz2 b/schismtracker-0.20100224.tar.bz2 deleted file mode 100644 index 0bd496f..0000000 --- a/schismtracker-0.20100224.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e75dc05ac6613478a8913abf9b4b8c13b4c9e43f3ed13506b4ff20e03c5fd6a -size 923132 diff --git a/schismtracker-0.20110409.tar.xz b/schismtracker-0.20110409.tar.xz new file mode 100644 index 0000000..031d8e3 --- /dev/null +++ b/schismtracker-0.20110409.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d6c04a3eb95b5acd414bb6860ecbed6a341ed50c818bbbd416b2b944484abc +size 786356 diff --git a/schismtracker.changes b/schismtracker.changes index e6dafab..fa5e654 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 9 01:39:48 UTC 2011 - jengelh@medozas.de + +- updated to Hg snapshot 20110409 +- removed __DATE__/__TIME__ from source (via patch) + ------------------------------------------------------------------- Mon Aug 30 23:41:58 UTC 2010 - jengelh@medozas.de diff --git a/schismtracker.spec b/schismtracker.spec index b8663fc..5240119 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -1,19 +1,20 @@ Name: schismtracker -Version: 0.20100224 +Version: 0.20110409 Release: 1 URL: http://schismtracker.org/ License: GPL v2 or later Group: Productivity/Multimedia/Sound/Editors and Convertors Summary: Music editor that aims to match the look and feel of Impulse Tracker #Hg-Clone: http://schismtracker.org/hg/ -Source: %{name}-%{version}.tar.bz2 -Source1: %{name}.desktop +Source: %name-%version.tar.xz +Source1: %name.desktop Patch1: schism-alsa.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch2: schism-nodate.diff +BuildRoot: %_tmppath/%name-%version-build BuildRequires: SDL-devel >= 1.2.10 BuildRequires: xorg-x11-devel -BuildRequires: alsa-devel freeglut-devel gcc-c++ -BuildRequires: python >= 2.4 +BuildRequires: alsa-devel, freeglut-devel, gcc-c++ +BuildRequires: python >= 2.4, xz BuildRequires: update-desktop-files %description @@ -25,8 +26,8 @@ highly modified version of the Modplug engine, with a number of bugfixes and changes to improve IT playback. %prep -%setup -q -n %{name} -%patch -P 1 -p1 +%setup -q -n %name +%patch -P 1 -P 2 -p1 %build if [ ! -e configure ]; then @@ -36,23 +37,24 @@ fi make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install +make DESTDIR=%buildroot install # install icons for size in 16 22 24 32 36 48 64 72 96 128 192; do - install -D -m 0644 icons/schism-icon-$size.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{name}.png + install -D -m 0644 icons/schism-icon-$size.png %buildroot%_datadir/icons/hicolor/${size}x$size/apps/%name.png done -install -D -m 0644 icons/schism-icon.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +install -D -m 0644 icons/schism-icon.svg %buildroot%_datadir/icons/hicolor/scalable/apps/%name.svg # install desktop file -%suse_update_desktop_file -i %{name} +%suse_update_desktop_file -i %name %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %buildroot %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README -%{_bindir}/schismtracker -%{_datadir}/icons/hicolor -%{_datadir}/applications/%{name}.desktop +%_bindir/schismtracker +%_datadir/icons/hicolor +%_datadir/applications/%name.desktop +%_mandir/man*/* %changelog