rpms/gmpc/FC-6 gmpc-lib-plugins.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 gmpc.spec, 1.8, 1.9 sources, 1.2, 1.3

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/gmpc/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31054

Modified Files:
	.cvsignore gmpc.spec sources 
Added Files:
	gmpc-lib-plugins.diff 
Log Message:
* Sat Dec 09 2006 Adrian Reber <adrian at lisas.de> - 0.13.0-1
- updated to 0.13.0
- created devel package for header files
- removed X-Fedora from desktop-file-install
- added some plugins and moved the plugins to %{_libdir}/%{name}/plugins


gmpc-lib-plugins.diff:

--- NEW FILE gmpc-lib-plugins.diff ---
--- main.c.old	2006-12-09 15:57:40.000000000 +0100
+++ src/main.c	2006-12-09 15:57:15.000000000 +0100
@@ -241,6 +241,9 @@
 	
 
 
+	url = g_strdup_printf("%s/%s",@@PLUGINS_PATH@@, "plugins");
+	plugin_load_dir(url);
+	g_free(url);
 	url = g_strdup_printf("%s/%s",GLADE_PATH, "plugins");
 	plugin_load_dir(url);
 	g_free(url);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gmpc/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:35:27 -0000	1.2
+++ .cvsignore	19 Dec 2006 22:11:51 -0000	1.3
@@ -1 +1,6 @@
-gmpc-0.11.2.tar.gz
+gmpc-0.13.0.tar.gz
+gmpc-autoplaylist-0.1.0.tar.gz
+gmpccaa-0.1.0.tar.gz
+gmpcmdcover-0.1.0.tar.gz
+gmpcosd-0.1.0.tar.gz
+gmpcstream-0.1.0.tar.gz


Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/FC-6/gmpc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gmpc.spec	30 Aug 2006 15:28:18 -0000	1.8
+++ gmpc.spec	19 Dec 2006 22:11:51 -0000	1.9
@@ -1,17 +1,24 @@
 Name:           gmpc
 Summary:        GNOME frontend for the MPD
-Version:        0.11.2
-Release:        6%{?dist}
+Version:        0.13.0
+Release:        1%{?dist}
 
 License:        GPL
 Group:          Applications/Multimedia
-URL:            http://musicpd.org/?page=gmpc
-Source0:        http://mercury.chem.pitt.edu/~shank/gmpc-0.11.2.tar.gz
+URL:            http://sarine.nl/gmpc
+Source0:        http://download.qballcow.nl/programs/gmpc-0.13/gmpc-0.13.0.tar.gz
+Source1:        http://download.qballcow.nl/programs/gmpc-0.13/Plugins/gmpc-autoplaylist-0.1.0.tar.gz
+Source2:        http://download.qballcow.nl/programs/gmpc-0.13/Plugins/gmpccaa-0.1.0.tar.gz
+Source3:        http://download.qballcow.nl/programs/gmpc-0.13/Plugins/gmpcmdcover-0.1.0.tar.gz
+Source4:        http://download.qballcow.nl/programs/gmpc-0.13/Plugins/gmpcosd-0.1.0.tar.gz
+Source5:        http://download.qballcow.nl/programs/gmpc-0.13/Plugins/gmpcstream-0.1.0.tar.gz
+Patch0:         gmpc-lib-plugins.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  scrollkeeper, gtk2-devel, libglade2-devel
 BuildRequires:  gettext, gnome-vfs2-devel, desktop-file-utils
-BuildRequires:  perl-XML-Parser
+BuildRequires:  perl-XML-Parser, libmpd-devel, findutils
+BuildRequires:  curl-devel, xosd-devel
 
 %description
 Gmpc is a GNOME client for the Music Player Daemon
@@ -24,42 +31,59 @@
  * ID3 information
  * Lots more
 
+%package devel
+Summary:  Development files for gmpc
+Group:    Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+This package includes header files necessary for developing gmpc plugins.
+
 %prep
-%setup -q
+%setup -q -a 1 -a 2 -a 3 -a 4 -a 5
+# this patch adds %{_libdir}/gmpc/plugins to the plugins search path
+%patch0
+sed -i -e 's,@@PLUGINS_PATH@@,"%{_libdir}/%{name}",g' src/main.c
 
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags} LDFLAGS=-Wl,--export-dynamic
-
+ln -s src gmpc
+export PKG_CONFIG_PATH="$PWD/data"
+export CFLAGS="-I$PWD"
+for i in gmpc-autoplaylist-0.1.0 gmpccaa-0.1.0 gmpcmdcover-0.1.0 gmpcosd-0.1.0 gmpcstream-0.1.0; do
+	pushd $i
+	%configure
+	make %{?_smp_mflags}
+	popd
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
+# this is the default search path
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
+# rpmlint complains if arch-dependent files are in %{_datadir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+
+for i in gmpc-autoplaylist-0.1.0 gmpccaa-0.1.0 gmpcmdcover-0.1.0 gmpcosd-0.1.0 gmpcstream-0.1.0; do
+	pushd $i
+	find . -name *so -exec cp {} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \;
+	popd
+done
+install -p -D gmpc-autoplaylist-0.1.0/glade/apl.glade $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/apl/apl.glade
+install -p -D gmpcstream-0.1.0/data/osb.glade $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/osb/osb.glade
 
 %find_lang %{name}
 
-# desktop files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install  --vendor fedora \
         --delete-original \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-        --add-category X-Fedora \
         $RPM_BUILD_ROOT%{_datadir}/applications/gmpc.desktop
 
 
-#%post
-#export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#gconftool-2 --makefile-install-rule \
-#  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null
-
-#%preun
-#export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#gconftool-2 --makefile-uninstall-rule \
-#  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,9 +93,21 @@
 %{_bindir}/%name
 %{_datadir}/applications/*.desktop
 %{_datadir}/%{name}
+%{_libdir}/%{name}
 %{_datadir}/pixmaps/*
 
+%files devel
+%defattr(0644,root,root,755)
+%{_includedir}/%{name}/*.h
+%{_libdir}/pkgconfig/*.pc
+
 %changelog
+* Sat Dec 09 2006 Adrian Reber <adrian at lisas.de> - 0.13.0-1
+- updated to 0.13.0
+- created devel package for header files
+- removed X-Fedora from desktop-file-install
+- added some plugins and moved the plugins to %%{_libdir}/%%{name}/plugins
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.11.2-6
 - BR: perl-XML-Parser
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gmpc/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Dec 2004 16:35:27 -0000	1.2
+++ sources	19 Dec 2006 22:11:51 -0000	1.3
@@ -1 +1,6 @@
-a7cc8c0734fef9e0b05be76cea3c0a20  gmpc-0.11.2.tar.gz
+dbbb1880feb8b9c2493ece670520299b  gmpc-0.13.0.tar.gz
+046ed7e57fac849d3b33a5b37ff7540e  gmpc-autoplaylist-0.1.0.tar.gz
+f55ae657b4664d393d9058d4d06e1d2b  gmpccaa-0.1.0.tar.gz
+65122a0b0e789a4977f45921d2dc3de1  gmpcmdcover-0.1.0.tar.gz
+2e160ee4fa3e0e80439678c92d95ef79  gmpcosd-0.1.0.tar.gz
+da8341cf96d9e3885bd78a56ef13cd03  gmpcstream-0.1.0.tar.gz