rpms/libzzub/devel libzzub-doclocationfix.patch, NONE, 1.1 libzzub.spec, 1.2, 1.3

[Alexander Kahl (akahl)]

Author: akahl

Update of /cvs/pkgs/rpms/libzzub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26958/devel

Modified Files:
	libzzub.spec 
Added Files:
	libzzub-doclocationfix.patch 
Log Message:
revision -8

libzzub-doclocationfix.patch:

--- NEW FILE libzzub-doclocationfix.patch ---
diff -up libzzub-0.2.3/SConstruct.doclocationfix libzzub-0.2.3/SConstruct
--- libzzub-0.2.3/SConstruct.doclocationfix	2007-09-20 15:58:09.000000000 +0200
+++ libzzub-0.2.3/SConstruct	2007-09-20 16:01:57.000000000 +0200
@@ -238,6 +238,7 @@ binpath = "${DESTDIR}${PREFIX}/bin"
 libpath = "${DESTDIR}${PREFIX}${LIBDIR}"
 includepath = "${DESTDIR}${PREFIX}/include"
 pluginpath = "${DESTDIR}${PREFIX}${LIBDIR}/zzub"
+docpath = "${DESTDIR}${PREFIX}/share/doc/libzzub-%s" % VERSION
 
 def install(target, source, perm=None, symlink=False):
 	if not perm:
@@ -261,7 +262,7 @@ def install_bin(source):
 def install_plugin(source):
 	return install(pluginpath, source)
 def install_plugin_help(name, files):
-	return install("${DESTDIR}${PREFIX}/share/doc/zzub/plugins/"+name, files, 0644)
+	return install(docpath + "/plugins/%s" % name, files, 0644)
 
 env['DSPLIB_SRC_PATH'] = '${ROOTPATH}/src/dsplib'
 env['ASIOSDK_SRC_PATH'] = '${ROOTPATH}/src/ASIOSDK2'
@@ -590,3 +591,4 @@ if hasattr(env, 'MSVSSolution'):
 install(includepath+'/zzub', 'include/zzub/plugin.h')
 install(includepath+'/zzub', 'include/zzub/types.h')
 install(includepath+'/zzub', 'include/zzub/signature.h')
+install(docpath, ['ChangeLog', 'CREDITS', 'LICENCE', 'REVISION'])


Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/devel/libzzub.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libzzub.spec	17 Sep 2007 16:19:05 -0000	1.2
+++ libzzub.spec	21 Sep 2007 13:11:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		libzzub
 Version:	0.2.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Powerful music sequencing library
 
 Group:		System Environment/Libraries
@@ -18,6 +18,7 @@
 Patch0:		libzzub-buildfix.patch
 Patch1:		libzzub-sonamefix.patch
 Patch2:		libzzub-internalflacfix.patch
+Patch3:		libzzub-doclocationfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch:	ppc64
@@ -67,6 +68,7 @@
 %patch1 -p1 -b .sonamefix
 mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
 %patch2 -p1 -b .internalflacfix
+%patch3 -p1 -b .doclocationfix
 
 
 %build
@@ -99,15 +101,6 @@
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-cd $RPM_BUILD_ROOT%{_docdir}
-%{__mv} zzub %{name}-%{version}
-
-%{__mkdir_p} %{name}-devel-%{version}/examples
-cd %{name}-devel-%{version}/examples
-%{__cp} -a $RPM_BUILD_ROOT%{_libdir}/lunar/fx/* .
-%{__rm} -f */*.so
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lunar/fx/*/*.{xml,cpp,h}
-
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -120,24 +113,28 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CREDITS LICENCE REVISION
 %{_bindir}/ccmplayer
 %{_libdir}/liblunarstd.so
 %{_libdir}/*.so.*
 %{_libdir}/zzub
 %{_libdir}/lunar
+%{_defaultdocdir}/%{name}-%{version}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/libzzub.so
-%{_defaultdocdir}/%{name}-devel-%{version}
 
 %files -n pyzzub
 %defattr(-,root,root,-)
 %{python_sitelib}/zzub
 
 %changelog
+* Thu Sep 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-8
+- included patch to install missing documentation to the right place
+- removed move macro instead
+- moved all plugin files *.{cpp,h,xml} back to get the lunar plugin loading right
+
 * Mon Sep 17 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-7
 - re-added pyzzub python-devel build requirement
 - explicitly nailed the name of pyzzub