rpms/moblin-panel-myzone/devel mpm-fixdso.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 moblin-panel-myzone.spec, 1.17, 1.18 sources, 1.12, 1.13

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-panel-myzone/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13745

Modified Files:
	.cvsignore moblin-panel-myzone.spec sources 
Added Files:
	mpm-fixdso.patch 
Log Message:
 - new upstream 0.1.34 release

mpm-fixdso.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mpm-fixdso.patch ---
--- moblin-panel-myzone-0.1.34/penge/Makefile.in.orig	2010-07-26 13:47:20.152054519 +0100
+++ moblin-panel-myzone-0.1.34/penge/Makefile.in	2010-07-26 13:48:56.431063314 +0100
@@ -184,7 +184,7 @@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -ljana-ecal -ljana-gtk -ljana
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	18 Apr 2010 11:44:18 -0000	1.12
+++ .cvsignore	26 Jul 2010 14:55:49 -0000	1.13
@@ -1 +1 @@
-moblin-panel-myzone-0.0.13.tar.gz
+moblin-panel-myzone-0.1.34.tar.gz


Index: moblin-panel-myzone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/moblin-panel-myzone.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- moblin-panel-myzone.spec	26 Jul 2010 09:29:16 -0000	1.17
+++ moblin-panel-myzone.spec	26 Jul 2010 14:55:49 -0000	1.18
@@ -1,22 +1,23 @@
 Name:          moblin-panel-myzone
-Version:       0.0.13
-Release:       5%{?dist}
+Version:       0.1.34
+Release:       1%{?dist}
 Summary:       Moblin Panel for MyZone
 
 Group:         System Environment/Libraries
 License:       GPLv2+
 URL:           http://www.moblin.org
-Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.gz
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/moblin-panel-myzone-%{version}.tar.gz
+Patch0:        mpm-fixdso.patch
 
 BuildRequires: clutter-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: GConf2-devel
 BuildRequires: gtk2-devel
 BuildRequires: jana-devel
-BuildRequires: nbtk-devel
-BuildRequires: mojito-devel
+BuildRequires: libmx-devel
+BuildRequires: libsocialweb-devel
 BuildRequires: mutter-moblin-devel
+BuildRequires: telepathy-glib-devel
 BuildRequires: intltool
 
 Requires: dbus
@@ -37,9 +38,14 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fixdso
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-capplet
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags} V=1
 
 %install
@@ -61,18 +67,24 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
+%{_sysconfdir}/gconf/schemas/moblin-panel-myzone.schemas
+%{_sysconfdir}/xdg/autostart/moblin-panel-myzone.desktop
 %{_libdir}/libpenge.so.*
 %{_libexecdir}/moblin-panel-myzone
 %{_datadir}/dbus-1/services/org.moblin.UX.Shell.Panels.myzone.service
+%{_datadir}/applications/myzone.desktop
+%{_datadir}/mutter-moblin/panels/moblin-panel-myzone.desktop
 %{_datadir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libpenge.so
+%{_libdir}/pkgconfig/penge.pc
+%{_includedir}/%{name}
 
 %changelog
-* Mon Jul 26 2010 Caolán McNamara <caolanm at redhat.com> 0.0.13-5
-- Bump build for new evolution
+* Mon Jul 26 2010 Peter Robinson <pbrobinson at gmail.com> 0.1.34-1
+- new upstream 0.1.34 release
 
 * Wed May 26 2010 Peter Robinson <pbrobinson at gmail.com> 0.0.13-4
 - Bump build for new evolution


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-panel-myzone/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	18 Apr 2010 11:44:18 -0000	1.12
+++ sources	26 Jul 2010 14:55:49 -0000	1.13
@@ -1 +1 @@
-c97cd4e636cb4890fd329485887e22e1  moblin-panel-myzone-0.0.13.tar.gz
+fc499bca1aa79da0d292c77eb13e4872  moblin-panel-myzone-0.1.34.tar.gz