[qtractor: 1/2] Update to 0.5.8
Brendan Jones
bsjones at fedoraproject.org
Mon Apr 22 04:40:10 UTC 2013
commit 2fd1856ef6fe11fc084be9e971004ec5c2a13254
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date: Mon Apr 22 06:38:42 2013 +0200
Update to 0.5.8
.gitignore | 1 +
qtractor-libmad-factorout-makefile.patch | 56 ++++++++++++++++++++++++++++++
qtractor-libmad-factorout.patch | 49 --------------------------
qtractor.spec | 7 +++-
sources | 2 +-
5 files changed, 64 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d9bd4c9..6a8644b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/qtractor-0.5.5.tar.gz
/qtractor-0.5.6.tar.gz
/qtractor-0.5.7.tar.gz
+/qtractor-0.5.8.tar.gz
diff --git a/qtractor-libmad-factorout-makefile.patch b/qtractor-libmad-factorout-makefile.patch
new file mode 100644
index 0000000..ba83e1f
--- /dev/null
+++ b/qtractor-libmad-factorout-makefile.patch
@@ -0,0 +1,56 @@
+--- qtractor-0.5.8/Makefile.in 2013-04-22 05:58:13.016728322 +0200
++++ qtractor-0.5.8.refactor/Makefile.in 2013-04-22 05:35:52.302715527 +0200
+@@ -277,26 +290,35 @@ export datarootdir = @datarootdir@
+ export localedir = @localedir@
+
+
+-all: $(target)
++all: $(target) $(mad_target)
+
+
+ $(target): $(name).mak $(resources) ${forms} $(sources) $(headers)
+ @$(MAKE) -f $(name).mak
+
++$(mad_target): $(name)_mad.mak $(mad_sources) $(mad_headers)
++ @$(MAKE) -f $(name)_mad.mak
++
++
+ $(name).mak: $(name).pro
+ @$(qmake) -o $(name).mak $(name).pro
+
++$(name)_mad.mak: $(name)_mad.pro
++ @$(qmake) -o $(name)_mad.mak $(name)_mad.pro
+
+-translations_lupdate: $(name).pro
+- @$(lupdate) -verbose $(name).pro
++mad_plugin: $(mad_target)
+
+-translations_lrelease: translations_lupdate $(translations_targets)
++$(translation_targets): $(name).pro
++ @$(lupdate) -verbose $(name).pro
+
+ %.qm: %.ts
+ @$(lrelease) -verbose $< -qm $@
+
+
+-install: $(target) translations_lrelease
++install_mad: $(mad_target)
++ @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name)_mad.mak install
++
++install: $(target) $(mad_install_target) $(translations_targets)
+ @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
+ @install -d -v -m 0755 $(DESTDIR)$(localedir)
+ @install -v -m 0644 $(translations_targets) $(DESTDIR)$(localedir)
+@@ -307,8 +329,11 @@ uninstall: $(DESTDIR)$(prefix)/bin/$(nam
+ @for x in $(translations_targets); do \
+ rm -vf $(DESTDIR)$(localedir)/`basename $$x`; done
+
++clean_mad: $(name)_mad.mak
++ @$(MAKE) -f $(name)_mad.mak clean
++ @rm -f $(mad_target) $(name)_mad.mak
+
+-clean: $(name).mak
++clean: $(name).mak $(clean_mad)
+ @$(MAKE) -f $(name).mak clean
+ @rm -f $(target) $(target).mak $(name).mak
+ @rm -rf *.cache *.log *.status $(translations_targets)
diff --git a/qtractor-libmad-factorout.patch b/qtractor-libmad-factorout.patch
index 13afc41..c5a6797 100644
--- a/qtractor-libmad-factorout.patch
+++ b/qtractor-libmad-factorout.patch
@@ -117,55 +117,6 @@ diff -rupN qtractor-0.5.5.old/Makefile.in qtractor-0.5.5/Makefile.in
forms = \
src/qtractorBusForm.ui \
src/qtractorClipForm.ui \
-@@ -279,23 +292,33 @@ export datarootdir = @datarootdir@
- export localedir = @localedir@
-
-
--all: $(target) $(translations_targets)
-+all: $(target) $(mad_target) $(translations_targets)
-
-
- $(target): $(name).mak $(resources) ${forms} $(sources) $(headers)
- @$(MAKE) -f $(name).mak
-
-+$(mad_target): $(name)_mad.mak $(mad_sources) $(mad_headers)
-+ @$(MAKE) -f $(name)_mad.mak
-+
- $(name).mak: $(name).pro
- @$(qmake) -o $(name).mak $(name).pro
-
-+$(name)_mad.mak: $(name)_mad.pro
-+ @$(qmake) -o $(name)_mad.mak $(name)_mad.pro
-+
-+mad_plugin: $(mad_target)
-+
- $(translation_targets): $(name).pro
- @$(lupdate) -verbose $(name).pro
-
- %.qm: %.ts
- @$(lrelease) -verbose $< -qm $@
-
-+install_mad: $(mad_target)
-+ @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name)_mad.mak install
-
--install: $(target) $(translations_targets)
-+install: $(target) $(translations_targets) $(mad_install_target)
- @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
- @install -d -v -m 0755 $(DESTDIR)$(localedir)
- @install -v -m 0644 $(translations_targets) $(DESTDIR)$(localedir)
-@@ -306,8 +329,11 @@ uninstall: $(DESTDIR)$(prefix)/bin/$(nam
- @for x in $(translations_targets); do \
- rm -vf $(DESTDIR)$(localedir)/`basename $$x`; done
-
-+clean_mad: $(name)_mad.mak
-+ @$(MAKE) -f $(name)_mad.mak clean
-+ @rm -f $(mad_target) $(name)_mad.mak
-
--clean: $(name).mak
-+clean: $(name).mak $(mad_clean_target)
- @$(MAKE) -f $(name).mak clean
- @rm -f $(target) $(target).mak $(name).mak
- @rm -rf *.cache *.log *.status $(translations_targets)
diff -rupN qtractor-0.5.5.old/qtractor_mad.pro qtractor-0.5.5/qtractor_mad.pro
--- qtractor-0.5.5.old/qtractor_mad.pro 1969-12-31 19:00:00.000000000 -0500
+++ qtractor-0.5.5/qtractor_mad.pro 2012-06-24 04:27:11.320512459 -0400
diff --git a/qtractor.spec b/qtractor.spec
index af0ee8d..ae42405 100644
--- a/qtractor.spec
+++ b/qtractor.spec
@@ -10,13 +10,14 @@
Summary: Audio/MIDI multi-track sequencer
Name: qtractor
-Version: 0.5.7
+Version: 0.5.8
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://qtractor.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch1: qtractor-libmad-factorout.patch
+Patch2: qtractor-libmad-factorout-makefile.patch
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
@@ -47,6 +48,7 @@ dedicated to the personal home-studio.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
+%patch2 -p1
sed -i -e 's|archive|archive;|' src/qtractor.desktop.in
# Fix odd permissions
@@ -97,6 +99,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/%{name}
%changelog
+* Mon Apr 22 2013 Brendan Jones <brendan.jones.it at gmail.com> 0.5.8-1
+- Update to 0.5.8
+
* Sat Jan 05 2013 Brendan Jones <brendan.jones.it at gmail.com> 0.5.7-1
- Update to 0.5.7
diff --git a/sources b/sources
index 5d860df..5e04045 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3f42dc1125d6ec0bd88286fe7738f04 qtractor-0.5.7.tar.gz
+22abf4de4d5736f794e174ef06fe3a3c qtractor-0.5.8.tar.gz
More information about the scm-commits
mailing list