rpms/zynjacku/F-10 zynjacku-lv2path.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zynjacku.png, 1.1, 1.2 zynjacku.spec, 1.1, 1.2

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/zynjacku/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20379

Modified Files:
	.cvsignore sources zynjacku.png zynjacku.spec 
Added Files:
	zynjacku-lv2path.patch 
Log Message:
* Sun Jun 13 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 5-1
- Update to 5


zynjacku-lv2path.patch:

--- NEW FILE zynjacku-lv2path.patch ---
diff -rupN zynjacku-5.old/zynworld/lv2.py zynjacku-5/zynworld/lv2.py
--- zynjacku-5.old/zynworld/lv2.py	2009-06-07 15:28:42.000000000 -0400
+++ zynjacku-5/zynworld/lv2.py	2009-06-13 15:45:02.000000000 -0400
@@ -328,7 +328,7 @@ class LV2DB:
             if sys.platform == "darwin":
                 lv2path.append("/Library/Audio/Plug-Ins/LV2")
 
-            lv2path += ["/usr/local/lib/lv2", "/usr/lib/lv2"]
+            lv2path += ["/usr/local/lib/lv2", "/usr/lib/lv2", "/usr/local/lib64/lv2", "/usr/lib64/lv2"]
 
             print "LV2_PATH not set, defaulting to %s" % repr(lv2path)
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	17 Apr 2009 19:02:16 -0000	1.2
+++ .cvsignore	15 Jun 2009 21:36:32 -0000	1.3
@@ -1 +1 @@
-zynjacku-4.tar.bz2
+zynjacku-5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Apr 2009 19:02:16 -0000	1.2
+++ sources	15 Jun 2009 21:36:32 -0000	1.3
@@ -1 +1 @@
-20ead5385b1a47f0a148f9f27e8889ef  zynjacku-4.tar.bz2
+12f0d9ba4f531c2280960a4a3bd0ff91  zynjacku-5.tar.bz2


Index: zynjacku.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zynjacku/F-10/zynjacku.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- zynjacku.spec	17 Apr 2009 19:02:16 -0000	1.1
+++ zynjacku.spec	15 Jun 2009 21:36:32 -0000	1.2
@@ -1,27 +1,31 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		zynjacku
-Version:	4
-Release:	2%{?dist}
+Version:	5
+Release:	1%{?dist}
 Summary:	LV2 synths and plugins host
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://home.gna.org/zynjacku/	
 Source0:	http://download.gna.org/zynjacku/%{name}-%{version}.tar.bz2
-# Derived from the logo.png from the tarball
+# Derived from the art/logo/logo.png from the tarball
 Source1:	%{name}.png
 Source2:	%{name}.desktop
 Source3:	lv2rack.desktop
+# Correct lv2 path on 64bit systems:
+# https://gna.org/bugs/?13687
+Patch0:		%{name}-lv2path.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	lv2core-devel
 BuildRequires:	lv2dynparam-devel
 BuildRequires:	pygtk2-devel
-BuildRequires:	slv2-devel
 
 Requires:	pygtk2-libglade
+Requires:	python-lash
 
 Provides:	lv2rack = %{version}-%{release}
 
@@ -39,7 +43,7 @@ lv2rack is a host for LV2 effect plugins
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .lv2path
 
 %build
 export am_cv_python_pythondir=%{python_sitearch}
@@ -51,11 +55,14 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Fix weird permissions
+chmod -x $RPM_BUILD_ROOT%{python_sitearch}/zynworld/*.py
+
 # We don't need duplicate files
 ln -sf ../doc/%{name}-%{version}/gpl.txt $RPM_BUILD_ROOT/%{_datadir}/%{name}/
 
 # Kill .la files
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/*.la
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/zynworld/*.la
 
 # Icon
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/72x72/apps/
@@ -63,8 +70,8 @@ cp -a %{SOURCE1} $RPM_BUILD_ROOT/%{_data
 
 # .desktop files
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/ %{SOURCE2}
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications/ %{SOURCE3}
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ %{SOURCE2}
+desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ %{SOURCE3}
 
 
 %post
@@ -89,15 +96,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS gpl.txt NEWS README
 %{_bindir}/*
 # F-11+ automatically excludes these files:
-%if x%fedora < x11
+%if 0%{?fedora} < 11
 %exclude %{_bindir}/*.py?
 %endif
-%{python_sitearch}/*.so
+%{python_sitearch}/zynworld
 %{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/72x72/apps/%{name}.png
 
 %changelog
+* Sun Jun 13 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 5-1
+- Update to 5
+
 * Fri Apr 10 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 4-2
 - License is GPLv2
 - Clean up unnecessary bits from SPEC file