Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-01-09 Laszlo Peter <[email protected]>
authorlaca
Fri, 09 Jan 2004 05:41:46 +0000
changeset 1507 553abcbec206
parent 1506 75b2ccc36cf4
child 1508 bc32d918c0d2
2004-01-09 Laszlo Peter <[email protected]> * atk.spec: add patch, clean up for Solaris builds * glib2.spec: clean up for Solaris * gtk-doc.spec: Solaris fix * gtk2.spec: add missing .pc file, Solaris fixes * libglade.spec: clean up for Solaris * pango.spec: fix broken .pc file, clean up * patches/atk-01-fix_pc.diff: new * patches/gtk+-04-gdk_pc.diff: new * patches/pango-01-fix_pc.diff: new
ChangeLog file | annotate | diff | comparison | revisions
atk.spec file | annotate | diff | comparison | revisions
glib2.spec file | annotate | diff | comparison | revisions
gtk-doc.spec file | annotate | diff | comparison | revisions
gtk2.spec file | annotate | diff | comparison | revisions
libglade.spec file | annotate | diff | comparison | revisions
pango.spec file | annotate | diff | comparison | revisions
patches/atk-01-fix_pc.diff file | annotate | diff | comparison | revisions
patches/gtk+-04-gdk_pc.diff file | annotate | diff | comparison | revisions
patches/pango-01-fix_pc.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Thu Jan 08 17:24:53 2004 +0000
+++ b/ChangeLog	Fri Jan 09 05:41:46 2004 +0000
@@ -1,3 +1,15 @@
+2004-01-09  Laszlo Peter  <[email protected]>
+
+	* atk.spec: add patch, clean up for Solaris builds
+	* glib2.spec: clean up for Solaris
+	* gtk-doc.spec: Solaris fix
+	* gtk2.spec: add missing .pc file, Solaris fixes
+	* libglade.spec: clean up for Solaris
+	* pango.spec: fix broken .pc file, clean up
+	* patches/atk-01-fix_pc.diff: new
+	* patches/gtk+-04-gdk_pc.diff: new
+	* patches/pango-01-fix_pc.diff: new
+
 2004-01-08  Niall Power <[email protected]>
 
 	* epiphany.spec: devel packages include dir change to
--- a/atk.spec	Thu Jan 08 17:24:53 2004 +0000
+++ b/atk.spec	Fri Jan 09 05:41:46 2004 +0000
@@ -9,6 +9,7 @@
 Source:       http://ftp.gnome.org/pub/GNOME/sources/atk/1.5/%{name}-%{version}.tar.bz2
 Source1:      atk-l10n-po-0.6.tar.bz2
 Source2:      libatk-1.0.3.gz
+Patch:	      atk-01-fix_pc.diff
 URL:          http://www.gtk.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:	      %{_defaultdocdir}/doc
@@ -38,7 +39,8 @@
 
 %prep
 %setup -q
-tar -jxf %SOURCE1
+%patch -p1 -b .fix_pc
+bzcat %SOURCE1 | tar xf -
 
 %build
 CFLAGS="$RPM_OPT_FLAGS"			\
@@ -48,8 +50,8 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-install -d $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/man/man3
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +76,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 09 2004 - <[email protected]>
+- add patch to fix a broken .pc file
+- clean up for Solaris builds
 * Mon Dec 15 2003 - <[email protected]>
 - upgrade to 1.5.1 tarball
 
--- a/glib2.spec	Thu Jan 08 17:24:53 2004 +0000
+++ b/glib2.spec	Fri Jan 09 05:41:46 2004 +0000
@@ -6,7 +6,7 @@
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
 Summary:      Low level core compatibility library for GTK+ and GNOME
-Source:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.3/glib-%version.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.3/glib-%{version}.tar.bz2
 Source1:      glib2-l10n-po-0.6.tar.bz2
 Source2:      glib-genmarshal.1.gz
 Source3:      glib-mkenums.1.gz
@@ -48,8 +48,7 @@
 
 %prep
 %setup -q -n glib-%{version}
-
-tar jxvf %SOURCE1
+bzcat %SOURCE1 | tar xvf -
 
 %build
 CFLAGS="$RPM_OPT_FLAGS"			\
@@ -59,20 +58,20 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-install -d $RPM_BUILD_ROOT/usr/share/man/man1
-install -d $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/man/man1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/man/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/man/man1
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT/usr/share/man/man1
-install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE9 $RPM_BUILD_ROOT/usr/share/man/man3
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE9 $RPM_BUILD_ROOT%{_mandir}/man3
 #Copy zh_HK from zh_TW
 #Fixes bug 4930405
-install -d $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES
-install --mode=0644 $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES/
+install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
+install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
  
 %clean
 rm -rf $RPM_BUILD_ROOT
--- a/gtk-doc.spec	Thu Jan 08 17:24:53 2004 +0000
+++ b/gtk-doc.spec	Fri Jan 09 05:41:46 2004 +0000
@@ -35,7 +35,6 @@
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
--- a/gtk2.spec	Thu Jan 08 17:24:53 2004 +0000
+++ b/gtk2.spec	Fri Jan 09 05:41:46 2004 +0000
@@ -19,6 +19,7 @@
 Patch1:       gtk+-01-window-icons-for-message-dialog.diff
 Patch2:       gtk+-02-fileseldlg-navbuttons.diff
 Patch3:       gtk+-03-text-plain-dnd.diff
+Patch4:	      gtk+-04-gdk_pc.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -61,8 +62,10 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
-tar jxvf %SOURCE3
+bzcat %SOURCE3 | tar xvf -
+
 %build
 CFLAGS="$RPM_OPT_FLAGS"			\
 ./configure --prefix=%{_prefix}		\
@@ -138,6 +141,10 @@
 %{_mandir}/man3/*
 
 %changelog -n gtk2
+* Fri Jan 09 2004 - <[email protected]>
+- add a missing .pc file
+- clean up for Solaris builds
+
 * Wed Jan 07 2004 - <[email protected]>
 - Remove the tab cycling patch for notebooks, since it's already
   upstream.
--- a/libglade.spec	Thu Jan 08 17:24:53 2004 +0000
+++ b/libglade.spec	Fri Jan 09 05:41:46 2004 +0000
@@ -49,8 +49,8 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-install -d $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/man/man3
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
--- a/pango.spec	Thu Jan 08 17:24:53 2004 +0000
+++ b/pango.spec	Fri Jan 09 05:41:46 2004 +0000
@@ -11,6 +11,7 @@
 Source2:      libpango-1.0.3.gz
 Source3:      libpangoft2-1.0.3.gz
 Source4:      libpangox-1.0.3.gz
+Patch:	      pango-01-fix_pc.diff
 URL:          http://www.gtk.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -50,6 +51,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .fix_pc
 
 %build
 ./configure --prefix=%{_prefix} \
@@ -61,12 +63,12 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-install -d $RPM_BUILD_ROOT/usr/share/man/man1
-install -d $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/man/man1
-install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/man/man3
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/man/man3
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man3
+install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man3
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,6 +97,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jan 09 2004 - <[email protected]>
+- add patch to fix a broken .pc file
+- clean up for Solaris builds
+
 * Mon Dec 15 2003 - <[email protected]>
 - Updating to 1.3.1 tarball
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/atk-01-fix_pc.diff	Fri Jan 09 05:41:46 2004 +0000
@@ -0,0 +1,9 @@
+--- atk-1.5.1/atk-uninstalled.pc.in	Wed Jul 25 19:14:31 2001
++++ atk-1.5.1.new/atk-uninstalled.pc.in	Thu Jan  8 11:50:36 2004
+@@ -2,5 +2,5 @@
+ Description: Accessibility Toolkit, Not Installed
+ Version: @VERSION@
+ Requires: @GLIB_PACKAGES@
+-Libs: ${pc_top_builddir}/${pcfiledir}/atk/libatk.la
++Libs: ${pc_top_builddir}/${pcfiledir}/atk/libatk-@[email protected]
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk+-04-gdk_pc.diff	Fri Jan 09 05:41:46 2004 +0000
@@ -0,0 +1,15 @@
+--- gtk+/gdk-x11-2.0-uninstalled.pc	1970-01-01 12:00:00.000000000 +1200
++++ gtk+/gdk-x11-2.0-uninstalled.pc	Thu Jan  8 12:13:31 2004
+@@ -0,0 +1,12 @@
++prefix=/opt/jds
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++target=x11
++
++Name: GDK
++Description: GIMP Drawing Kit (${target} target)
++Version: 2.3.1
++Requires: gdk-pixbuf-2.0-uninstalled  pangoxft-uninstalled pangox-uninstalled
++Libs: ${pc_top_builddir}/${pcfiledir}/gdk/libgdk-${target}-2.0.la
++Cflags: -I${pc_top_builddir}/${pcfiledir}/gdk -I${pc_top_builddir}/${pcfiledir}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pango-01-fix_pc.diff	Fri Jan 09 05:41:46 2004 +0000
@@ -0,0 +1,50 @@
+--- pango-1.3.1/pango-uninstalled.pc.in	Thu Jun  7 17:40:01 2001
++++ pango-1.3.1.new/pango-uninstalled.pc.in	Thu Jan  8 08:53:59 2004
+@@ -1,7 +1,7 @@
+ Name: Pango Uninstalled
+ Description: Internationalized text handling, Not Installed
+ Version: @VERSION@
+-Requires: @[email protected],gobject-2.0,gmodule-2.0
++Requires: glib-2.0,gobject-2.0,gmodule-2.0
+ Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpango.la
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
+ 
+--- pango-1.3.1/pangoxft-uninstalled.pc.in	Thu Jun  7 17:40:01 2001
++++ pango-1.3.1.new/pangoxft-uninstalled.pc.in	Thu Jan  8 11:02:04 2004
+@@ -2,6 +2,6 @@
+ Description: X Window System font support for Pango, Not Installed
+ Version: @VERSION@
+ Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft.la @XFT_LIBS@
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@[email protected] @XFT_LIBS@
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @X_CFLAGS@ @FREETYPE_CFLAGS@
+ 
+--- pango-1.3.1/pango-uninstalled.pc.in	Thu Jan  8 11:05:18 2004
++++ pango-1.3.1.new/pango-uninstalled.pc.in	Thu Jan  8 11:28:02 2004
+@@ -2,6 +2,6 @@
+ Description: Internationalized text handling, Not Installed
+ Version: @VERSION@
+ Requires: glib-2.0,gobject-2.0,gmodule-2.0
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpango.la
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpango-@[email protected]
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
+ 
+--- pango-1.3.1/pangoft2-uninstalled.pc.in	Thu Jun  7 17:40:01 2001
++++ pango-1.3.1.new/pangoft2-uninstalled.pc.in	Thu Jan  8 11:28:09 2004
+@@ -2,6 +2,6 @@
+ Description: Freetype 2.0 font support for Pango, Not Installed
+ Version: @VERSION@
+ Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2.la @FREETYPE_LIBS@
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@[email protected] @FREETYPE_LIBS@
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @FREETYPE_CFLAGS@
+ 
+--- pango-1.3.1/pangox-uninstalled.pc.in	Thu Jun  7 17:40:01 2001
++++ pango-1.3.1.new/pangox-uninstalled.pc.in	Thu Jan  8 11:28:14 2004
+@@ -2,5 +2,5 @@
+ Description: X Window System font support for Pango, Not Installed
+ Version: @VERSION@
+ Requires: pango
+-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangox.la @X_LIBS@
++Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangox-@[email protected] @X_LIBS@
+ Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
sustaining/oi_151a/spec-files