Author: glen Date: Sun Sep 6 00:54:31 2009 GMT Module: packages Tag: HEAD ---- Log message: - fix packaging, more deps
---- Files affected: packages/museek+: museek+.spec (1.1 -> 1.2) , sitescriptdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/museek+/museek+.spec diff -u packages/museek+/museek+.spec:1.1 packages/museek+/museek+.spec:1.2 --- packages/museek+/museek+.spec:1.1 Sat Sep 5 19:09:57 2009 +++ packages/museek+/museek+.spec Sun Sep 6 02:54:26 2009 @@ -3,22 +3,25 @@ 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 @@ -98,6 +101,8 @@ %prep %setup -q +%patch0 -p1 +grep -r /usr/bin/env . -l | xargs sed -i -e '1s,#!.*env python,#!%{__python},' %build mkdir build @@ -112,29 +117,9 @@ %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 @@ -158,10 +143,10 @@ %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) @@ -169,26 +154,22 @@ %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 @@ -198,7 +179,7 @@ %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 @@ -208,5 +189,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2009/09/06 00:54:26 glen +- fix packaging, more deps + Revision 1.1 2009/09/05 17:09:57 glen - initial, based on fedora spec. needs build fixing ================================================================ Index: packages/museek+/sitescriptdir.patch diff -u /dev/null packages/museek+/sitescriptdir.patch:1.1 --- /dev/null Sun Sep 6 02:54:31 2009 +++ packages/museek+/sitescriptdir.patch Sun Sep 6 02:54:26 2009 @@ -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}) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/museek+/museek+.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
