From c2dc374e1e7b60e881c6ae2eb3c2a27d445dc35e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:56:20 +0000 Subject: [PATCH 1/4] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From d2df9602b86ec09fa43701707895ba39a08f05a9 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Fri, 6 Mar 2009 03:40:42 +0000 Subject: [PATCH 2/4] - Update to version 0.13 --- .cvsignore | 2 +- aldrin-docfix.patch | 102 +++++++++++++++++++++++++++----------------- aldrin.spec | 76 ++++++++++++++++----------------- sources | 2 +- 4 files changed, 102 insertions(+), 80 deletions(-) diff --git a/.cvsignore b/.cvsignore index 901ec6c..f079d9e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -aldrin-0.11.tar.bz2 +aldrin-0.13.tar.gz diff --git a/aldrin-docfix.patch b/aldrin-docfix.patch index 9aba628..ca8f360 100644 --- a/aldrin-docfix.patch +++ b/aldrin-docfix.patch @@ -1,46 +1,68 @@ -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']) +diff -rupN aldrin.old/doc/SConscript aldrin/doc/SConscript +--- aldrin.old/doc/SConscript 2009-01-09 16:25:21.000000000 -0500 ++++ aldrin/doc/SConscript 2009-02-23 16:22:46.000000000 -0500 +@@ -31,4 +31,5 @@ install('${DOC_PATH}/images', + glob.glob('aldrin/images/*.gif') + + glob.glob('aldrin/images/*.png')) - # 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 +- ++install('${DOC_PATH}', ++ ['../ChangeLog', '../CREDITS', '../LICENCE']) +diff -rupN aldrin.old/SConstruct aldrin/SConstruct +--- aldrin.old/SConstruct 2009-01-09 16:25:21.000000000 -0500 ++++ aldrin/SConstruct 2009-02-23 16:20:14.000000000 -0500 +@@ -61,7 +61,7 @@ env['SITE_PACKAGE_PATH'] = distutils.sys + env['APPLICATIONS_PATH'] = '${DESTDIR}${PREFIX}/share/applications' + env['BIN_PATH'] = '${DESTDIR}${PREFIX}/bin' + env['SHARE_PATH'] = '${DESTDIR}${PREFIX}/share/aldrin' +-env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin' ++env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin-' + VERSION + env['ETC_PATH'] = '${DESTDIR}${ETCDIR}/aldrin' + env['ICONS_ALDRIN_PATH'] = '${DESTDIR}${PREFIX}/share/icons/aldrin' + env['ICONS_HICOLOR_PATH'] = '${DESTDIR}${PREFIX}/share/icons/hicolor' +diff -rupN aldrin.old/src/components/mainwindow.py aldrin/src/components/mainwindow.py +--- aldrin.old/src/components/mainwindow.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/mainwindow.py 2009-02-23 16:33:44.000000000 -0500 +@@ -44,7 +44,7 @@ show_preferences = preferences.show_pref + from aldrin.utils import CancelException + + import aldrin.com as com +- ++from about import VERSION + def cmp_view(a,b): + a_order = (hasattr(a, '__view__') and a.__view__.get('order',0)) or 0 + b_order = (hasattr(b, '__view__') and b.__view__.get('order',0)) or 0 +@@ -551,7 +551,7 @@ class AldrinFrame(gtk.Window): + @type event: MenuEvent """ import webbrowser - webbrowser.open_new(filepath('../doc/aldrin/html/index.html')) -+ webbrowser.open_new(filepath('../doc/aldrin-0.11/html/index.html')) ++ webbrowser.open_new(filepath('../doc/aldrin'+VERSION.split(" ")[0]+'/html/index.html')) - def on_about(self, event): + def on_about(self, *args): """ +diff -rupN aldrin.old/src/components/rack.py aldrin/src/components/rack.py +--- aldrin.old/src/components/rack.py 2009-01-09 16:25:22.000000000 -0500 ++++ aldrin/src/components/rack.py 2009-02-23 17:08:46.000000000 -0500 +@@ -30,7 +30,7 @@ from aldrin.utils import prepstr, filepa + get_item_count, question, error, new_listview, add_scrollbars, get_clipboard_text, set_clipboard_text, \ + gettext, new_stock_image_button, diff + import zzub +-import sys,os ++import sys,os,glob + import fnmatch + import ctypes + import time +@@ -728,9 +728,10 @@ class ParameterView(gtk.VBox): + """ + uri = filenameify(self.pluginloader.get_uri()) + name = filenameify(self.pluginloader.get_name()) ++ zzubdocpath = glob.glob("../doc/libzzub-*")[0] + helpfilepaths = [ +- filepath('../doc/zzub/plugins/' + uri + '/index.html'), +- filepath('../doc/zzub/plugins/' + name + '/index.html'), ++ filepath(zzubdocpath + '/plugins/' + uri + '/index.html'), ++ filepath(zzubdocpath + '/plugins/' + name + '/index.html'), + ] + for path in helpfilepaths: + print "searching for '%s'..." % path diff --git a/aldrin.spec b/aldrin.spec index 3067eb8..7977a2c 100644 --- a/aldrin.spec +++ b/aldrin.spec @@ -1,21 +1,19 @@ -Name: aldrin -Version: 0.11 -Release: 6%{?dist} -Summary: Modular music sequencer/tracker +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +Name: aldrin +Version: 0.13 +Release: 1%{?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 +URL: http://code.google.com/p/aldrin-sequencer/ +Source0: http://aldrin-sequencer.googlecode.com/files/%{name}-%{version}.tar.gz 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: scons BuildRequires: desktop-file-utils -Requires: pyzzub = 0.2.3 +Requires: pyzzub >= 0.2.6 Requires: pygtk2 %description @@ -26,31 +24,28 @@ samples. %prep -%setup -q -mac2unix SConstruct -%patch0 -p1 -b docfix +%setup -q -n %{name} +%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 '{}' \; - +# Fix encoding iconv --from-code=ISO-8859-1 --to-code=UTF-8 CREDITS > CREDITS~ +touch -r CREDITS CREDITS~ %{__mv} CREDITS~ CREDITS +# Fix permission +%{__chmod} 644 src/components/player.py + %install %{__rm} -rf $RPM_BUILD_ROOT -scons install PREFIX=$RPM_BUILD_ROOT%{_prefix} +scons install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT -desktop-file-install \ - --vendor="fedora" \ - --remove-category="Application" \ - --delete-original \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +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 @@ -58,30 +53,35 @@ desktop-file-install \ %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 - +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %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 || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files %defattr(-,root,root,-) -%{_bindir}/aldrin +%{_bindir}/aldrin* +%config(noreplace) %{_sysconfdir}/%{name} +%{python_sitelib}/%{name} %{_defaultdocdir}/%{name}-%{version} %{_datadir}/%{name} +%{_datadir}/icons/%{name} +%{_datadir}/pixmaps/%{name} %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/* %changelog +* Fri Feb 27 2009 Orcan Ogetbil - 0.13-1 +- Update to version 0.13 + * Fri Oct 5 2007 Alexander Kahl - 0.11-6 - added ExludeArch for ppc64 to reflect libzzub unavailability on that arch diff --git a/sources b/sources index 99b111e..9a6924e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a40ea5852e34b69abc55e12d049aef8 aldrin-0.11.tar.bz2 +6bdbd4a48883cc7d4734fef3055947b2 aldrin-0.13.tar.gz From d8a79ce6aea45918403882efd3e2eba2d2216162 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:59 +0000 Subject: [PATCH 3/4] 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 6a2ae34fb7f442dda611295592825846c043557c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:41:06 +0000 Subject: [PATCH 4/4] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10