packages: museek+/museek+.spec, museek+/sitescriptdir.patch - mucihpher sha...

[glen]

Author: glen                         Date: Mon Sep  7 06:04:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mucihpher shared lib into libdir

---- Files affected:
packages/museek+:
   museek+.spec (1.8 -> 1.9) , sitescriptdir.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/museek+/museek+.spec
diff -u packages/museek+/museek+.spec:1.8 packages/museek+/museek+.spec:1.9
--- packages/museek+/museek+.spec:1.8	Mon Sep  7 07:33:51 2009
+++ packages/museek+/museek+.spec	Mon Sep  7 08:04:37 2009
@@ -2,7 +2,7 @@
 Summary:	A Qt soulseek client for Linux
 Name:		museek+
 Version:	0.2
-Release:	0.4
+Release:	0.5
 License:	GPL v2+
 Group:		Applications/Networking
 Source0:	http://dl.sourceforge.net/museek-plus/%{name}-%{version}.tar.bz2
@@ -137,6 +137,8 @@
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
 %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
 %clean
@@ -162,10 +164,9 @@
 
 %files bindings
 %defattr(644,root,root,755)
-# XXX
-%attr(755,root,root) %{py_sitescriptdir}/_mucipherc.so
-%{py_sitescriptdir}/mucipher.py[co]
-%{py_sitescriptdir}/mucipherc.py[co]
+%attr(755,root,root) %{py_sitedir}/_mucipherc.so
+%{py_sitedir}/mucipher.py[co]
+%{py_sitedir}/mucipherc.py[co]
 %dir %{py_sitescriptdir}/museek
 %{py_sitescriptdir}/museek/*.py[co]
 
@@ -212,6 +213,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/09/07 06:04:37  glen
+- mucihpher shared lib into libdir
+
 Revision 1.8  2009/09/07 05:33:51  glen
 - qt deps
 

================================================================
Index: packages/museek+/sitescriptdir.patch
diff -u packages/museek+/sitescriptdir.patch:1.1 packages/museek+/sitescriptdir.patch:1.2
--- packages/museek+/sitescriptdir.patch:1.1	Sun Sep  6 02:54:26 2009
+++ packages/museek+/sitescriptdir.patch	Mon Sep  7 08:04:37 2009
@@ -5,7 +5,7 @@
    ${CMAKE_CURRENT_BINARY_DIR}/_mucipherc.so
  )
 -EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('lib', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
-+EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join('share', 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
++EXECUTE_PROCESS(COMMAND python -c "import sys; import os; print os.path.join(sys.lib, 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]), 'site-packages')" museek OUTPUT_VARIABLE sitepackages OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_VARIABLE error)
  
  if (NOT sitepackages OR error)
  	MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/museek+/museek+.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/museek+/sitescriptdir.patch?r1=1.1&r2=1.2&f=u