diff --git a/.gitignore b/.gitignore index 877f1b2..1f69080 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ qrq-0.1.4.tar.gz +/qrq-0.2.0.tar.gz diff --git a/qrq-0.1.4-makefile.patch b/qrq-0.1.4-makefile.patch deleted file mode 100644 index d554fbf..0000000 --- a/qrq-0.1.4-makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- qrq-0.1.4/Makefile 2008-06-22 22:27:57.000000000 +0300 -+++ qrq-0.1.4-mod/Makefile 2008-09-03 21:33:00.000000000 +0300 -@@ -73,12 +73,12 @@ - install -d -v $(DESTDIR)/share/qrq/ - install -d -v $(DESTDIR)/share/man/man1/ - install -d -v $(DESTDIR)/bin/ -- install -s -m 0755 qrq $(DESTDIR)/bin/ -- install -m 0755 qrqscore $(DESTDIR)/bin/ -- install -m 0644 qrq.1 $(DESTDIR)/share/man/man1/ -- install -m 0644 callbase $(DESTDIR)/share/qrq/ -- install -m 0644 qrqrc $(DESTDIR)/share/qrq/ -- install -m 0644 toplist $(DESTDIR)/share/qrq/ -+ install -p -m 0755 qrq $(DESTDIR)/bin/ -+ install -p -m 0755 qrqscore $(DESTDIR)/bin/ -+ install -p -m 0644 qrq.1 $(DESTDIR)/share/man/man1/ -+ install -p -m 0644 callbase $(DESTDIR)/share/qrq/ -+ install -p -m 0644 qrqrc $(DESTDIR)/share/qrq/ -+ install -p -m 0644 toplist $(DESTDIR)/share/qrq/ - - - uninstall: diff --git a/qrq-0.2.0-makefile.patch b/qrq-0.2.0-makefile.patch new file mode 100644 index 0000000..5288a2e --- /dev/null +++ b/qrq-0.2.0-makefile.patch @@ -0,0 +1,24 @@ +diff -Naur qrq-0.2.0/Makefile qrq-0.2.0-mod/Makefile +--- qrq-0.2.0/Makefile 2011-05-08 00:00:51.000000000 +0300 ++++ qrq-0.2.0-mod/Makefile 2011-05-08 14:41:49.000000000 +0300 +@@ -85,13 +85,13 @@ + install -d -v $(DESTDIR)/share/qrq/ + install -d -v $(DESTDIR)/share/man/man1/ + install -d -v $(DESTDIR)/bin/ +- install -s -m 0755 qrq $(DESTDIR)/bin/ +- install -m 0755 qrqscore $(DESTDIR)/bin/ +- install -m 0644 qrq.1 $(DESTDIR)/share/man/man1/ +- install -m 0644 callbase.qcb $(DESTDIR)/share/qrq/ +- install -m 0644 english.qcb $(DESTDIR)/share/qrq/ +- install -m 0644 qrqrc $(DESTDIR)/share/qrq/ +- install -m 0644 toplist $(DESTDIR)/share/qrq/ ++ install -p -m 0755 qrq $(DESTDIR)/bin/ ++ install -p -m 0755 qrqscore $(DESTDIR)/bin/ ++ install -p -m 0644 qrq.1 $(DESTDIR)/share/man/man1/ ++ install -p -m 0644 callbase.qcb $(DESTDIR)/share/qrq/ ++ install -p -m 0644 english.qcb $(DESTDIR)/share/qrq/ ++ install -p -m 0644 qrqrc $(DESTDIR)/share/qrq/ ++ install -p -m 0644 toplist $(DESTDIR)/share/qrq/ + + + uninstall: diff --git a/qrq.spec b/qrq.spec index c656503..6c459bf 100644 --- a/qrq.spec +++ b/qrq.spec @@ -1,6 +1,6 @@ Name: qrq -Version: 0.1.4 -Release: 6%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Morse telegraphy trainer Group: Applications/Communications @@ -8,10 +8,10 @@ License: GPLv2+ URL: http://fkurz.net/ham/qrq.html Source0: http://fkurz.net/ham/qrq/qrq-%{version}.tar.gz #Fix DESTDIR, Don't strip, preserve timestamps -Patch0: qrq-0.1.4-makefile.patch +Patch0: qrq-0.2.0-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel +BuildRequires: ncurses-devel, pulseaudio-libs-devel #Requires: %description @@ -26,7 +26,8 @@ copy callsigns at high speeds, as needed for example for Contesting. %patch0 -p1 %build -make CFLAGS="%{optflags}" %{?_smp_mflags} +export CFLAGS="%{optflags}" +make %{?_smp_mflags} %install @@ -40,13 +41,20 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc CHANGELOG COPYING README +%doc ChangeLog COPYING README %{_bindir}/qrq %{_bindir}/qrqscore %{_mandir}/man?/* %{_datadir}/qrq %changelog +* Sun May 08 2011 Lucian Langa - 0.2.0-1 +- add pulseaudio-libs-devel BR +- update patch0 +- fix CFLAGS +- update shiped filenames +- new upstream release + * Tue Feb 08 2011 Fedora Release Engineering - 0.1.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 20ceee2..8f0cbcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -398b7368e10617deeba8e0e159755d7e qrq-0.1.4.tar.gz +e7a9ea5666be62cc55dbf6b99c2e07b4 qrq-0.2.0.tar.gz