Re: [Rhythmbox-devel] [patch] devel rpm package

[William Jon McCann <mccannwj pha jhu edu>]

Christian Schaller wrote:
> Hi,
> Yeah, I will continue maintaining the spec unless William has a burning
> desire to take over :) 
> 
> I am going away for the weekend but I look at integrating this patch
> during when I come back. Unless William gets to it first :)
> 
> Christian

Hi,

No burning desire here.  Not for that anyway ;)

Colin Walters wrote:
> In fact, Rhythmbox.h should not be installed at all as a system header;
> for example, it is not useful for applications which use other ORBs.

Attached patch should take care of this.

Jon
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/rhythmbox/ChangeLog,v
retrieving revision 1.628
diff -u -r1.628 ChangeLog
--- ChangeLog	15 Aug 2003 05:20:11 -0000	1.628
+++ ChangeLog	15 Aug 2003 19:52:40 -0000
@@ -1,3 +1,8 @@
+2003-08-15  William Jon McCann  <mccann@jhu.edu>
+
+	* rhythmbox.spec.in: 
+	* corba/Makefile.am: Don't install Rhythmbox.h.
+
 2003-08-15  Colin Walters  <walters@verbum.org>
 
 	* library/rb-library-main-thread.c: (thread_main):
Index: rhythmbox.spec.in
===================================================================
RCS file: /cvs/gnome/rhythmbox/rhythmbox.spec.in,v
retrieving revision 1.9
diff -u -r1.9 rhythmbox.spec.in
--- rhythmbox.spec.in	13 Aug 2003 17:53:16 -0000	1.9
+++ rhythmbox.spec.in	15 Aug 2003 19:52:40 -0000
@@ -69,11 +69,13 @@
 %{_libdir}/bonobo/librb-nautilus-context-menu.*
 %{_libdir}/bonobo/servers/*
 %{_libdir}/pkgconfig/*
-%{_includedir}/Rhythmbox.h
 #%{_datadir}/gnome/help/rhythmbox/C/*
 #%{_datadir}/omf/rhythmbox/rhythmbox-C.omf
 
 %changelog
+* Thu Aug 14 2003 William Jon McCann <mccann@jhu.edu>
+- Don't install Rhythmbox.h.
+
 * Wed Aug 13 2003 William Jon McCann <mccann@jhu.edu>
 - Updated dependencies and files
 
Index: corba/Makefile.am
===================================================================
RCS file: /cvs/gnome/rhythmbox/corba/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- corba/Makefile.am	31 Jul 2003 00:53:16 -0000	1.1
+++ corba/Makefile.am	15 Aug 2003 19:52:40 -0000
@@ -14,7 +14,7 @@
 	$(RHYTHMBOX_CFLAGS)				\
 	-D_XOPEN_SOURCE
 
-include_HEADERS = Rhythmbox.h
+noinst_HEADERS = Rhythmbox.h
 
 idldir = $(prefix)/share/idl
 idl_DATA = Rhythmbox.idl