[zynjacku] Update to 6 Drop upstreamed patch

Orcan Ogetbil oget at fedoraproject.org
Wed May 11 04:07:49 UTC 2011


commit b8e8d20d0fab7efc5a7e3f3657ae0e57dea58787
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Wed May 11 00:07:38 2011 -0400

    Update to 6
    Drop upstreamed patch

 .gitignore                  |    1 +
 sources                     |    2 +-
 zynjacku-zero-plugins.patch |   15 ---------------
 zynjacku.spec               |   25 +++++++++++++++----------
 4 files changed, 17 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80ad306..34aef65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 zynjacku-5.tar.bz2
+/zynjacku-6.tar.bz2
diff --git a/sources b/sources
index 1cc3e8d..b7710c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12f0d9ba4f531c2280960a4a3bd0ff91  zynjacku-5.tar.bz2
+4fe6bb1322ee5784280c7e71c77b636c  zynjacku-6.tar.bz2
diff --git a/zynjacku.spec b/zynjacku.spec
index 9c22dad..faa25bc 100644
--- a/zynjacku.spec
+++ b/zynjacku.spec
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		zynjacku
-Version:	5
-Release:	6%{?dist}
+Version:	6
+Release:	1%{?dist}
 Summary:	LV2 synths and plugins host
 Group:		Applications/Multimedia
 License:	GPLv2
@@ -15,9 +15,6 @@ Source3:	lv2rack.desktop
 # Correct lv2 path on 64bit systems:
 # https://gna.org/bugs/?13687
 Patch0:		%{name}-lv2path.patch
-# Don't crash when there are no plugins installed RHBZ#551480
-# Patch sent upstream via email
-Patch1:         %{name}-zero-plugins.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
@@ -32,6 +29,12 @@ Requires:	python-lash
 
 Provides:	lv2rack = %{version}-%{release}
 
+# we don't want to provide private python extension libs
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$ 
+%filter_setup
+}
+
 %description
 zynjacku is JACK based, GTK (2.x) host for LV2 synths. It has one JACK MIDI
 input port (routed to all hosted synths) and one (two for stereo synths) JACK
@@ -47,7 +50,9 @@ lv2rack is a host for LV2 effect plugins.
 %prep
 %setup -q
 %patch0 -p1 -b .lv2path
-%patch1 -p1 -b .noplugin
+
+# Remove redundant shebang
+sed -i '\|/usr/bin/env|d' zynworld/host.py
 
 %build
 export am_cv_python_pythondir=%{python_sitearch}
@@ -99,16 +104,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS gpl.txt NEWS README
 %{_bindir}/*
-# F-11+ automatically excludes these files:
-%if 0%{?fedora} < 11
-%exclude %{_bindir}/*.py?
-%endif
 %{python_sitearch}/zynworld
 %{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/72x72/apps/%{name}.png
 
 %changelog
+* Sat Apr 30 2011 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 6-1
+- Update to 6
+- Drop upstreamed patch
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list