diff --git a/.gitignore b/.gitignore index fc3fb7e..b553141 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ uqm-0.6.2-source.tgz /uqm-0.7.0-source.tgz +/uqm-0.7.0-1-source.tgz diff --git a/sources b/sources index 6b1e23e..731aac3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9018ea0493d7dac6a9e1006b00af7df uqm-0.7.0-source.tgz +SHA512 (uqm-0.7.0-1-source.tgz) = 77255e7e4cc195d4db7f02bb95e76d41c0d72cb179b30a8cd944c4c78560485d76ad89b0bbd03102e5718d66f3b16050ef73a30b6bc8d31e1c0bfa46758badaa diff --git a/uqm.spec b/uqm.spec index 8825baa..9b14dc6 100644 --- a/uqm.spec +++ b/uqm.spec @@ -1,19 +1,17 @@ Name: uqm Version: 0.7.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: The Ur-Quan Masters, a port of the classic game Star Control II -Group: Amusements/Games License: GPLv2+ URL: http://sc2.sourceforge.net/ -Source0: http://download.sf.net/sc2/%{name}-%{version}-source.tgz +Source0: http://download.sf.net/sc2/%{name}-%{version}-1-source.tgz Source1: %{name}.conf Source2: %{name}.sh Source3: %{name}.desktop Source4: %{name}-functions.sh Source5: %{name}.autodlrc Patch0: %{name}-optflags.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.8 BuildRequires: SDL_image-devel >= 1.2.4 @@ -40,20 +38,10 @@ version of Star Control II, with their permission and encouragement. %prep -%setup -q +%setup -qn uqm-0.7.0-1 find -type d -name CVS -exec rm -rf {} ';' %patch0 -p0 -#rename internal strings.h file to fix FTBFS. -cd src/uqm/comm/ -for d in */ ; do - cd $d - mv strings.h ustrings.h - cd .. -done -find . -type f -name '*.c' | xargs sed -i s/strings.h/ustrings.h/g -find . -type f -name '*.h' | xargs sed -i s/STRINGS/USTRINGS/g - %build echo INPUT_install_sharedir_VALUE=%{_datadir} > config.state sed -i 's|@CONTENTDIR@|~/.uqm|g' src/config_unix.h.in @@ -62,7 +50,6 @@ convert src/res/ur-quan-icon-std.ico uqm.png %install -rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir}} sed -e 's|/etc/|%{_sysconfdir}/|' %{SOURCE1} > \ @@ -122,13 +109,9 @@ SentUpstream: 2014-09-25 EOF -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog Contributing COPYING README +%license COPYING +%doc AUTHORS ChangeLog Contributing README %doc WhatsNew doc/users/manual.txt %config(noreplace) %{_sysconfdir}/uqm.conf %{_bindir}/uqm @@ -140,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 23 2018 Gwyn Ciesla - 0.7.0-16 +- Updated upstream. + * Tue Jan 23 2018 Gwyn Ciesla - 0.7.0-15 - Rename internal strings.h to fix FTBFS.