From d2851277275d947532c21a066f6d19b0390ca24c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 27 Sep 2007 16:26:49 +0000 Subject: [PATCH 1/5] Initialize branch F-7 for aldrin --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From de9a2aca5a3a61c1535eea7d850121d8ff14414a Mon Sep 17 00:00:00 2001 From: Alexander Kahl Date: Thu, 27 Sep 2007 19:20:15 +0000 Subject: [PATCH 2/5] initial import --- .cvsignore | 1 + aldrin-docfix.patch | 46 +++++++++++++++++++ aldrin.spec | 106 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 154 insertions(+) create mode 100644 aldrin-docfix.patch create mode 100644 aldrin.spec diff --git a/.cvsignore b/.cvsignore index e69de29..901ec6c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +aldrin-0.11.tar.bz2 diff --git a/aldrin-docfix.patch b/aldrin-docfix.patch new file mode 100644 index 0000000..9aba628 --- /dev/null +++ b/aldrin-docfix.patch @@ -0,0 +1,46 @@ +diff -up aldrin-0.11/SConstruct.docfix aldrin-0.11/SConstruct +--- aldrin-0.11/SConstruct.docfix 2007-09-25 20:55:58.000000000 +0200 ++++ aldrin-0.11/SConstruct 2007-09-25 20:55:58.000000000 +0200 +@@ -127,12 +127,14 @@ if win32: + install('${DESTDIR}${PREFIX}', 'aldrin.bat') + + # docs +-install('${DOC_INSTALL_PATH}/aldrin/html', ++install('${DOC_INSTALL_PATH}/aldrin-%s/html' % VERSION, + glob.glob('share/doc/aldrin/html/*.html') + + glob.glob('share/doc/aldrin/html/*.css')) +-install('${DOC_INSTALL_PATH}/aldrin/images', ++install('${DOC_INSTALL_PATH}/aldrin-%s/images' % VERSION, + glob.glob('share/doc/aldrin/images/*.gif') + + glob.glob('share/doc/aldrin/images/*.png')) ++install('${DOC_INSTALL_PATH}/aldrin-%s' % VERSION, ++ ['ChangeLog', 'CREDITS', 'LICENCE']) + + # icon theme + install(iconpath + '/16x16/apps', 'share/icons/hicolor/16x16/apps/aldrin.png') +diff -up aldrin-0.11/share/aldrin/router.py.docfix aldrin-0.11/share/aldrin/router.py +--- aldrin-0.11/share/aldrin/router.py.docfix 2007-09-25 21:16:54.000000000 +0200 ++++ aldrin-0.11/share/aldrin/router.py 2007-09-25 21:17:19.000000000 +0200 +@@ -698,8 +698,8 @@ class ParameterDialog(gtk.Dialog): + uri = filenameify(self.pluginloader.get_uri()) + name = filenameify(self.pluginloader.get_name()) + helpfilepaths = [ +- filepath('../doc/zzub/plugins/' + uri + '/index.html'), +- filepath('../doc/zzub/plugins/' + name + '/index.html'), ++ filepath('../doc/libzzub-0.2.3/plugins/' + uri + '/index.html'), ++ filepath('../doc/libzzub-0.2.3/plugins/' + name + '/index.html'), + ] + for path in helpfilepaths: + print "searching for '%s'..." % path +diff -up aldrin-0.11/share/aldrin/main.py.docfix aldrin-0.11/share/aldrin/main.py +--- aldrin-0.11/share/aldrin/main.py.docfix 2007-09-25 21:14:29.000000000 +0200 ++++ aldrin-0.11/share/aldrin/main.py 2007-09-25 21:16:17.000000000 +0200 +@@ -856,7 +856,7 @@ class AldrinFrame(gtk.Window): + @type event: wx.MenuEvent + """ + import webbrowser +- webbrowser.open_new(filepath('../doc/aldrin/html/index.html')) ++ webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html')) + + def on_about(self, event): + """ diff --git a/aldrin.spec b/aldrin.spec new file mode 100644 index 0000000..5ba819f --- /dev/null +++ b/aldrin.spec @@ -0,0 +1,106 @@ +Name: aldrin +Version: 0.11 +Release: 5%{?dist} +Summary: Modular music sequencer/tracker + +Group: Applications/Multimedia +License: GPLv2+ +URL: http://trac.zeitherrschaft.org/aldrin/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Patch0: aldrin-docfix.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: scons >= 0.96.92 +BuildRequires: dos2unix +BuildRequires: desktop-file-utils +Requires: pyzzub = 0.2.3 +Requires: pygtk2 + +%description +Aldrin is a powerful music composition software featuring a flexible audio +routing system commonly found in expensive audio software, enabling you to mix, +split, mutilate and modify audio signals emitted by software synthesizers and +samples. + + +%prep +%setup -q +mac2unix SConstruct +%patch0 -p1 -b docfix + + +%build +find share/aldrin share/doc \ + -regextype posix-egrep \ + -regex '.+\.(py|html|xml|prs|col|css)' \ + -exec mac2unix '{}' \; \ + -exec chmod 644 '{}' \; + +iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~ +%{__mv} CREDITS~ CREDITS + +%install +%{__rm} -rf $RPM_BUILD_ROOT +scons install PREFIX=$RPM_BUILD_ROOT%{_prefix} + +desktop-file-install \ + --vendor="fedora" \ + --remove-category="Application" \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + + +%post +update-desktop-database &> /dev/null || : + +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + + +%postun +update-desktop-database &> /dev/null || : + +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%files +%defattr(-,root,root,-) +%{_bindir}/aldrin +%{_defaultdocdir}/%{name}-%{version} +%{_datadir}/%{name} +%{_datadir}/applications/* +%{_datadir}/icons/hicolor/*/apps/* + +%changelog +* Thu Sep 27 2007 Alexander Kahl - 0.11-5 +- nailed to pyzzub version 0.2.3 for docpath compatibility + +* Tue Sep 25 2007 Alexander Kahl - 0.11-4 +- updated patch to fix referenced libzzub doc locations + +* Tue Sep 18 2007 Alexander Kahl - 0.11-3 +- generic sf.net source url +- adapted macros wherever feasible (both paths and commands) +- unified buildroot style +- removed redundant ldconfig update call +- new patch to rectify aldrin's installation doc directory and file list +- added missing python module requirement +- added update calls for GTK icon cache and desktop database + +* Tue Sep 18 2007 Alexander Kahl - 0.11-2 +- updated requires to new libzzub w/ integrated pyzzub +- removed redundant requires +- fixed rpm path macros +- fixed CREDITS encoding + +* Mon Sep 3 2007 Alexander Kahl - 0.11-1 +- initial release diff --git a/sources b/sources index e69de29..99b111e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1a40ea5852e34b69abc55e12d049aef8 aldrin-0.11.tar.bz2 From 485a8e26fc775d88a27104935ea7861636bdb4a3 Mon Sep 17 00:00:00 2001 From: Alexander Kahl Date: Fri, 5 Oct 2007 14:20:44 +0000 Subject: [PATCH 3/5] -6: ExcludeArch for ppc64 --- aldrin.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/aldrin.spec b/aldrin.spec index 5ba819f..3067eb8 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -1,6 +1,6 @@ Name: aldrin Version: 0.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Modular music sequencer/tracker Group: Applications/Multimedia @@ -11,6 +11,7 @@ Patch0: aldrin-docfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +ExcludeArch: ppc64 BuildRequires: scons >= 0.96.92 BuildRequires: dos2unix BuildRequires: desktop-file-utils @@ -60,7 +61,7 @@ update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi @@ -69,7 +70,7 @@ update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files @@ -81,6 +82,9 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Oct 5 2007 Alexander Kahl - 0.11-6 +- added ExludeArch for ppc64 to reflect libzzub unavailability on that arch + * Thu Sep 27 2007 Alexander Kahl - 0.11-5 - nailed to pyzzub version 0.2.3 for docpath compatibility From 3de659a5ce1caa747923814711072ed8ae207e31 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:59 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index da1591d..92c3eea 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: aldrin -# $Id$ +# $Id: Makefile,v 1.1 2007/09/27 16:26:44 kevin Exp $ NAME := aldrin SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 8dd0c98a86b4ab6ab01120105f42f8dbb0cdaa84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:41:03 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 92c3eea..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aldrin -# $Id: Makefile,v 1.1 2007/09/27 16:26:44 kevin Exp $ -NAME := aldrin -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7