- fix packaging, more deps

Changed files:
    museek+.spec -> 1.2
    sitescriptdir.patch -> 1.1

diff --git a/museek+.spec b/museek+.spec
index 227e91af2a9499c2ecc78a049ba983e75ab0d606..855ef0e6d77042ba093dd16891418c8ec2e6979c 100644 (file)
--- a/museek+.spec
+++ b/museek+.spec
@@ -2,22 +2,25 @@ Summary:      A Qt soulseek client for Linux
 Name:          museek+
 Version:       0.2
 Release:       0.1
-License:       - (enter GPL/GPL v2/GPL v3/LGPL/BSD/BSD-like/other license name here)
-Group:         Applications
+License:       GPL v2+
+Group:         Applications/Networking
 Source0:       http://dl.sourceforge.net/museek-plus/%{name}-%{version}.tar.bz2
 # Source0-md5: 66d3eab341e1cd6642f83d329a18c3b5
+Patch0:                sitescriptdir.patch
 URL:           http://www.museek-plus.org/
 BuildRequires: cmake
-BuildRequires: desktop-file-utils
+BuildRequires: sed >= 4.0
 BuildRequires: gamin-devel
 BuildRequires: libevent-devel
 BuildRequires: libvorbis-devel
 BuildRequires: libxml++-devel
+BuildRequires: libxml2-devel
 BuildRequires: python-PyXML
 BuildRequires: python-devel
 BuildRequires: python-pygtk-devel
 BuildRequires: qt4-build
 BuildRequires: swig
+BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -97,6 +100,8 @@ Museek+.
 
 %prep
 %setup -q
+%patch0 -p1
+grep -r /usr/bin/env . -l | xargs sed -i -e '1s,#!.*env python,#!%{__python},'
 
 %build
 mkdir build
@@ -111,29 +116,9 @@ cd build
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
+       -C build \
        DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --delete-original \
-  --vendor=pld \
-  --add-category=Network \
-  --dir=$RPM_BUILD_ROOT%{_desktopdir} \
-  $RPM_BUILD_ROOT%{_desktopdir}/murmur.desktop
-
-desktop-file-install \
-  --delete-original \
-  --vendor=pld \
-  --add-category=Network \
-  --dir=$RPM_BUILD_ROOT%{_desktopdir} \
-  $RPM_BUILD_ROOT%{_desktopdir}/museeq.desktop
-
-desktop-file-install \
-  --delete-original \
-  --vendor=pld \
-  --add-category=Network \
-  --dir=$RPM_BUILD_ROOT%{_desktopdir} \
-  $RPM_BUILD_ROOT%{_desktopdir}/musetup-gtk.desktop
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -157,10 +142,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files bindings
 %defattr(644,root,root,755)
-%{py_sitedir}/_mucipherc.so
-%{py_sitedir}/mucipher.py*
-%{py_sitedir}/mucipherc.py*
-%{py_sitedir}/museek
+%{py_sitescriptdir}/_mucipherc.so
+%{py_sitescriptdir}/mucipher.py*
+%{py_sitescriptdir}/mucipherc.py*
+%{py_sitescriptdir}/museek
 
 %files tools
 %defattr(644,root,root,755)
@@ -168,26 +153,22 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/museekchat
 %attr(755,root,root) %{_bindir}/museekcontrol
 %attr(755,root,root) %{_bindir}/musirc.py
-%if 0%{?fedora} < 11
-%exclude %{_bindir}/musirc.pyo
-%exclude %{_bindir}/musirc.pyc
-%endif
 %{_mandir}/man1/mulog.1*
 %{_mandir}/man1/museekcontrol.1*
 
 %files mucous
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mucous
-%{py_sitedir}/pymucous
+%{py_sitescriptdir}/pymucous
 %{_mandir}/man1/mucous.1*
 
 %files murmur
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/murmur
 %attr(755,root,root) %{_bindir}/musetup-gtk
-%{py_sitedir}/pymurmur
-%{_desktopdir}/fedora-murmur.desktop
-%{_desktopdir}/fedora-musetup-gtk.desktop
+%{py_sitescriptdir}/pymurmur
+%{_desktopdir}/murmur.desktop
+%{_desktopdir}/musetup-gtk.desktop
 %{_mandir}/man1/murmur.1*
 %{_mandir}/man1/musetup-gtk.1*
 %{_pixmapsdir}/murmur-??px.png
@@ -197,6 +178,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/museeq
 %attr(755,root,root) %{_bindir}/musetup-qt
 %{_mandir}/man1/museeq.1*
-%{_desktopdir}/fedora-museeq.desktop
+%{_desktopdir}/museeq.desktop
 %{_datadir}/museek/museeq
 %{_pixmapsdir}/museeq.png

diff --git a/sitescriptdir.patch b/sitescriptdir.patch
new file mode 100644 (file)
index 0000000..7b42923
--- /dev/null
+++ b/sitescriptdir.patch
@@ -0,0 +1,44 @@
+--- museek+-0.2/Mucipher/PyMucipher/CMakeLists.txt~    2008-10-07 19:58:27.000000000 +0300
++++ museek+-0.2/Mucipher/PyMucipher/CMakeLists.txt     2009-09-05 21:12:34.623680910 +0300
+@@ -37,7 +37,7 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/mucipherc.py
+   ${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)
+ 
+ if (NOT sitepackages OR error)
+       MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
+--- museek+-0.2/python-bindings/CMakeLists.txt~        2008-09-22 11:49:33.000000000 +0300
++++ museek+-0.2/python-bindings/CMakeLists.txt 2009-09-05 21:12:58.263288468 +0300
+@@ -18,7 +17,7 @@
+ museek/driver.py
+ )
+ 
+-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)
+ 
+ if (NOT sitepackages OR error)
+       MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
+--- museek+-0.2/mucous/CMakeLists.txt~ 2008-09-22 11:49:33.000000000 +0300
++++ museek+-0.2/mucous/CMakeLists.txt  2009-09-05 21:13:09.923689706 +0300
+@@ -28,7 +26,7 @@
+   ${PYMUCOUS_FILES}
+ )
+ 
+-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)
+ 
+ if (NOT sitepackages OR error)
+       MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})
+--- museek+-0.2/murmur/CMakeLists.txt~ 2008-09-22 11:49:33.000000000 +0300
++++ museek+-0.2/murmur/CMakeLists.txt  2009-09-05 21:13:18.836605046 +0300
+@@ -25,7 +22,7 @@
+   ${PYMURMUR_FILES}
+ )
+ 
+-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)
+ 
+ if (NOT sitepackages OR error)
+       MESSAGE(FATAL_ERROR "Failed to find Python's site-packages directory" ${sitepackages} ${error})