summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--a2jmidid-linking.patch11
-rw-r--r--a2jmidid.spec14
-rw-r--r--sources2
4 files changed, 10 insertions, 18 deletions
diff --git a/.gitignore b/.gitignore
index d6577cf..487b550 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
a2jmidid-6.tar.bz2
+/a2jmidid-7.tar.bz2
diff --git a/a2jmidid-linking.patch b/a2jmidid-linking.patch
deleted file mode 100644
index c99c906..0000000
--- a/a2jmidid-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN a2jmidid-6.old/wscript a2jmidid-6/wscript
---- a2jmidid-6.old/wscript 2009-12-06 19:53:25.000000000 -0500
-+++ a2jmidid-6/wscript 2010-05-19 13:13:20.000000000 -0400
-@@ -130,6 +130,7 @@ def build(bld):
- prog.includes = '.' # make waf dependency tracking work
- prog.target = 'a2jmidid'
- prog.uselib = 'ALSA JACK DBUS-1'
-+ prog.env.append_value("LINKFLAGS", "-ldl")
-
- prog = bld.create_obj('cc', 'program')
- prog.source = 'a2jmidi_bridge.c'
diff --git a/a2jmidid.spec b/a2jmidid.spec
index 95217c9..ce30a93 100644
--- a/a2jmidid.spec
+++ b/a2jmidid.spec
@@ -1,12 +1,9 @@
Summary: Daemon for exposing ALSA sequencer applications in JACK MIDI system
Name: a2jmidid
-Version: 6
-Release: 3%{?dist}
+Version: 7
+Release: 1%{?dist}
URL: http://home.gna.org/a2jmidid/
Source0: http://download.gna.org/%{name}/%{name}-%{version}.tar.bz2
-# Fix DSO linking error
-# https://gna.org/support/index.php?2547
-Patch0: a2jmidid-linking.patch
# a2jmidi_bridge.c and j2amidi_bridge.c are GPLv2+
# The rest is GPLv2
License: GPLv2 and GPLv2+
@@ -34,7 +31,6 @@ one ALSA sequencer port and one JACK MIDI port. Such bridge is unidirectional.
%prep
%setup -q
-%patch0 -p1 -b .linking
%build
export CFLAGS="%{optflags}"
@@ -58,8 +54,14 @@ rm -fr %{buildroot}
%{_bindir}/a2jmidi_bridge
%{_bindir}/j2amidi_bridge
%{_datadir}/dbus-1/services/org.gna.home.a2jmidid.service
+%{_mandir}/man1/a2j*
+%{_mandir}/man1/j2a*
%changelog
+* Wed Jan 26 2011 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 7-1
+- Update to 7.
+- Drop upstreamed patches.
+
* Fri Jul 16 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 6-3
- Fix license tag
diff --git a/sources b/sources
index d65bf34..b801303 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-461969bc19a5331e9e81441c6431ef20 a2jmidid-6.tar.bz2
+195f5587904ce307cbcd4ef89f2c791f a2jmidid-7.tar.bz2