2008-07-10 Damien Carbery <[email protected]>
authordcarbery
Thu, 10 Jul 2008 15:48:48 +0000
changeset 12795 827898d598ee
parent 12794 93074e8d11aa
child 12796 0ef61733e123
2008-07-10 Damien Carbery <[email protected]> * SUNWtgnome-tsoljdsdevmgr.spec: Add 01-gtk-disable-deprecated. * patches/tsoljdsdevmgr-01-gtk-disable-deprecated.diff: Remove the -DGTK_DISABLE_DEPRECATED define to get module to build with new gtk+ tarball.
ChangeLog
SUNWtgnome-tsoljdsdevmgr.spec
patches/tsoljdsdevmgr-01-gtk-disable-deprecated.diff
--- a/ChangeLog	Thu Jul 10 15:05:42 2008 +0000
+++ b/ChangeLog	Thu Jul 10 15:48:48 2008 +0000
@@ -1,3 +1,10 @@
+2008-07-10  Damien Carbery <[email protected]>
+
+	* SUNWtgnome-tsoljdsdevmgr.spec: Add 01-gtk-disable-deprecated.
+	* patches/tsoljdsdevmgr-01-gtk-disable-deprecated.diff: Remove the
+	  -DGTK_DISABLE_DEPRECATED define to get module to build with new gtk+
+	  tarball.
+
 2008-07-10  Damien Carbery <[email protected]>
 
 	* SUNWgnome-gvfs.spec: Add Build/Requires SUNWavahi-bridge-dsd/-devel
--- a/SUNWtgnome-tsoljdsdevmgr.spec	Thu Jul 10 15:05:42 2008 +0000
+++ b/SUNWtgnome-tsoljdsdevmgr.spec	Thu Jul 10 15:48:48 2008 +0000
@@ -17,6 +17,8 @@
 Summary:                 GNOME Trusted Device Manager
 Version:                 %{default_pkg_version}
 Source:			 http://dlc.sun.com/osol/jds/downloads/extras/tjds/tsoljdsdevmgr-%{devmgr_version}.tar.bz2
+# date:2008-07-10 owner:dcarbery type:bug
+Patch1:                  tsoljdsdevmgr-01-gtk-disable-deprecated.diff
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
@@ -44,6 +46,7 @@
 
 %prep
 %setup -q -n tsoljdsdevmgr-%{devmgr_version}
+%patch1 -p1
 
 %build
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"
@@ -87,6 +90,9 @@
 %endif
 
 %changelog
+* Thu Jul 10 2008 - [email protected]
+- Add 01-gtk-disable-deprecated to get module to build with new gtk+ tarball.
+
 * Fri May 16 2008 - [email protected]
 - Uprev version, remove upstream patch, remove conditional build
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/tsoljdsdevmgr-01-gtk-disable-deprecated.diff	Thu Jul 10 15:48:48 2008 +0000
@@ -0,0 +1,10 @@
+--- tsoljdsdevmgr-0.6.2/src/Makefile.am.orig	2008-07-10 16:05:23.633126300 +0100
++++ tsoljdsdevmgr-0.6.2/src/Makefile.am	2008-07-10 16:05:30.071778500 +0100
+@@ -1,6 +1,6 @@
+ INCLUDES = -I. -I$(srcdir) -I/usr/openwin/include/X11/extenstions 	\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
+-	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 		\
++	-DG_DISABLE_DEPRECATED \
+ 	-DGNOME_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED 		\
+ 	-DGNOME_ICONDIR=\"$(prefix)/share/pixmaps\"			\
+ 	$(TSOLJDSDEVMGR_CFLAGS)