rpms/museek+/F-7 .cvsignore, 1.2, 1.3 museek+.spec, 1.2, 1.3 sources, 1.2, 1.3 museek-launcher, 1.1, NONE museeqdesktoppatch.diff, 1.1, NONE

Julian Sikorski (belegdol) fedora-extras-commits at redhat.com
Sun Aug 26 07:55:59 UTC 2007


Author: belegdol

Update of /cvs/extras/rpms/museek+/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14059

Modified Files:
	.cvsignore museek+.spec sources 
Removed Files:
	museek-launcher museeqdesktoppatch.diff 
Log Message:
* Tue Aug 25 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.13-1
- Updated to 0.1.13
- Fixed License tag as per latest guidelines
- Install musetup-gtk desktop file
- Drop building with scons in favour of cmake
- Killed museek-launcher and respective patch since we now have 3 separate clients
- Added README and TODO to %doc



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/museek+/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Dec 2006 21:05:14 -0000	1.2
+++ .cvsignore	26 Aug 2007 07:55:26 -0000	1.3
@@ -1 +1 @@
-museek+-0.1.12.tar.bz2
+museek+-0.1.13.tar.bz2


Index: museek+.spec
===================================================================
RCS file: /cvs/extras/rpms/museek+/F-7/museek+.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- museek+.spec	23 Dec 2006 07:19:40 -0000	1.2
+++ museek+.spec	26 Aug 2007 07:55:26 -0000	1.3
@@ -1,16 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           museek+
-Version:        0.1.12
-Release:        5%{?dist}
+Version:        0.1.13
+Release:        1%{?dist}
 Summary:        A Soulseek filesharing client
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://museek-plus.sourceforge.net/
 Source0:        http://dl.sourceforge.net/museek-plus/%{name}-%{version}.tar.bz2
-Source3:        museek-launcher
-Patch0:         museeqdesktoppatch.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -22,7 +20,7 @@
 BuildRequires: libvorbis-devel
 BuildRequires: PyXML
 BuildRequires: pygtk2-devel
-BuildRequires: scons
+BuildRequires: cmake
 BuildRequires: qt-qsa-devel
 
 %description
@@ -30,37 +28,38 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .museeqdesktoppatch
 
 
 %build
-scons PREFIX=%{_prefix} MANDIR=%{_mandir}/man1 CFLAGS="$RPM_OPT_FLAGS -fPIC" %{?_smp_mflags}
+%cmake -DEVERYTHING=1 -DMANDIR=%{_mandir} \
+  -DTRAYICON=1 -DBINRELOC=0 .
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
+  --delete-original \
   --vendor=fedora \
+  --add-category=Network \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-  --add-category=X-Fedora \
-  museeq.desktop
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/murmur.desktop
 
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-%{__install} -p -m 0644 icons/museeq-circle2.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-
-%{__install} -p -m 0755 %SOURCE3 ${RPM_BUILD_ROOT}%{_bindir}
+desktop-file-install \
+  --delete-original \
+  --vendor=fedora \
+  --add-category=Network \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/museeq.desktop
 
-cd icons
-for th in museeq*.tar
-do tar -xvf $th;
-done
-%{__install} -p -m 0644 CREDITS ${RPM_BUILD_ROOT}%{_datadir}/museek/museeq
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/museek/museeq/itheme
-%{__install} -p -m 0644 itheme/* ${RPM_BUILD_ROOT}%{_datadir}/museek/museeq/itheme
-mkdir ${RPM_BUILD_ROOT}%{_datadir}/museek/museeq/raven
-%{__install} -p -m 0644 raven/* ${RPM_BUILD_ROOT}%{_datadir}/museek/museeq/raven
+desktop-file-install \
+  --delete-original \
+  --vendor=fedora \
+  --add-category=Network \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/musetup-gtk.desktop
 
 
 %clean
@@ -69,30 +68,49 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYING CREDITS LICENSE
+%doc CHANGELOG COPYING CREDITS LICENSE README TODO
 %{_bindir}/mucous
 %{_bindir}/mulog
+%{_bindir}/murmur
 %{_bindir}/muscan
 %{_bindir}/muscand
-%{_bindir}/museek-launcher
+%{_bindir}/museekchat
 %{_bindir}/museekcontrol
 %{_bindir}/museekd
 %{_bindir}/museeq
 %{_bindir}/musetup
 %{_bindir}/musetup-gtk
-%{python_sitelib}/museek
-%{python_sitelib}/pymucous
+%{_bindir}/musetup-qt
+%{_bindir}/musirc.py
+%exclude %{_bindir}/musirc.pyo
+%exclude %{_bindir}/musirc.pyc
 %{python_sitelib}/_mucipherc.so
 %{python_sitelib}/mucipher.py*
 %{python_sitelib}/mucipherc.py*
+%{python_sitelib}/museek
+%{python_sitelib}/pymucous
+%{python_sitelib}/pymurmur
+%{_mandir}/man1/*.1.gz
+%{_datadir}/applications/fedora-murmur.desktop
 %{_datadir}/applications/fedora-museeq.desktop
+%{_datadir}/applications/fedora-musetup-gtk.desktop
+%{_datadir}/config.xml.tmpl
 %{_datadir}/museek
-%{_datadir}/pixmaps/museeq-circle2.png
-%{_mandir}/man1/*.1.gz
+%{_datadir}/pixmaps/murmur-??px.png
+%{_datadir}/pixmaps/museek_alt2.png
+%{_datadir}/pixmaps/museeq.png
 
 
 
 %changelog
+* Tue Aug 25 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.13-1
+- Updated to 0.1.13
+- Fixed License tag as per latest guidelines
+- Install musetup-gtk desktop file
+- Drop building with scons in favour of cmake
+- Killed museek-launcher and respective patch since we now have 3 separate clients
+- Added README and TODO to %%doc
+
 * Sat Dec 23 2006 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.12-5
 - Added QSA support
 - Use macros for install command


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/museek+/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Dec 2006 21:05:14 -0000	1.2
+++ sources	26 Aug 2007 07:55:27 -0000	1.3
@@ -1 +1 @@
-5d871e40dc93c04e60688a06e0e143e8  museek+-0.1.12.tar.bz2
+7aada627839578ebe525c54a1cef7dc4  museek+-0.1.13.tar.bz2


--- museek-launcher DELETED ---


--- museeqdesktoppatch.diff DELETED ---




More information about the fedora-extras-commits mailing list