rpms/frysk/FC-4 antlr.patch,1.1,1.2 frysk.spec,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 27 21:10:48 UTC 2006
- Previous message (by thread): rpms/kernel/devel linux-2.6-suspend-memhotplug-oops.patch, NONE, 1.1 kernel-2.6.spec, 1.1880, 1.1881
- Next message (by thread): rpms/microcode_ctl/devel .cvsignore, 1.4, 1.5 microcode_ctl.patch, 1.5, 1.6 microcode_ctl.spec, 1.28, 1.29 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cagney
Update of /cvs/dist/rpms/frysk/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20680
Modified Files:
antlr.patch frysk.spec
Log Message:
* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.6
- Add the macros build_glib2, build_glib_java, build_fontconfig,
build_atk, build_cairo, build_cairo_java, build_pango, build_gtk2,
build_libgtk_java, build_libglade2, build_libglade_java,
build_libvte_java, and build_jdom. Wrap corresponding build code.
* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.5
- Update antlr.patch, update includes Wu Zhou's basename fix, and
up-to-date config.guess and config.sub.
* Thu Jan 26 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.4
- From Diego Novello <dnovillo at redhat.com>: Add
libglade-java-20060125-fix-64bit-miscompilation.patch.
* Thu Jan 26 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.3
- From Wu Zhou <woodzltc at cn.ibm.com>: Add -m64 to ppc64 CC et.al.
* Mon Jan 23 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.2
- In -files, only list frysk.desktop and fryskTrayIcon48.png when
build_frysk.
- Define all install paths in terms of macros.
antlr.patch:
.cvsignore | 1
ChangeLog | 40 +
Makefile.in | 22 -
antlr/Makefile.in | 7
configure | 28 -
configure.in | 28 -
scripts/config.guess | 1120 +++++++++++++++++++++++++++------------------------
scripts/config.sub | 498 ++++++++++++++++------
scripts/cpp.sh.in | 4
scripts/cxx.sh.in | 4
scripts/jar.sh.in | 4
scripts/javac.sh.in | 4
scripts/lib.sh.in | 6
scripts/link.sh.in | 4
14 files changed, 1079 insertions(+), 691 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 antlr.patch
Index: antlr.patch
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/antlr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- antlr.patch 24 Jan 2006 00:33:58 -0000 1.1
+++ antlr.patch 27 Jan 2006 21:10:44 -0000 1.2
@@ -1,14 +1,28 @@
Index: frysk-imports/antlr/.cvsignore
diff -u /dev/null frysk-imports/antlr/.cvsignore:1.1
---- /dev/null Mon Jan 23 17:26:35 2006
+--- /dev/null Mon Jan 23 17:26:35 2006
+++ frysk-imports/antlr/.cvsignore Sat Nov 26 14:17:25 2005
@@ -0,0 +1 @@
+autom4te.cache
Index: frysk-imports/antlr/ChangeLog
-diff -u /dev/null frysk-imports/antlr/ChangeLog:1.5
---- /dev/null Mon Jan 23 17:26:35 2006
-+++ frysk-imports/antlr/ChangeLog Tue Nov 29 02:40:39 2005
-@@ -0,0 +1,26 @@
+diff -u /dev/null frysk-imports/antlr/ChangeLog:1.7
+--- /dev/null Mon Jan 23 17:26:35 2006
++++ frysk-imports/antlr/ChangeLog Fri Jan 27 04:46:36 2006
+@@ -0,0 +1,40 @@
++2006-01-26 Andrew Cagney <cagney at redhat.com>
++
++ Fix from Wu Zhou <woodzltc at cn.ibm.com>:
++ * configure.in: Correctly quote basename applied to commands.
++ * scripts/cpp.sh.in: Ditto.
++ * scripts/cxx.sh.in: Ditto.
++ * scripts/jar.sh.in: Ditto.
++ * scripts/javac.sh.in: Ditto.
++ * scripts/lib.sh.in: Ditto.
++ * scripts/link.sh.in: Ditto.
++ * configure: Re-generate.
++
++ * scripts/config.sub, scripts/config.guess: Import 2006-01-02.
++
+2005-11-28 Andrew Cagney <cagney at redhat.com>
+
+ * scripts/javac.sh.in: Accept gcj4.
@@ -76,9 +90,9 @@
install ::
echo "installation done"
Index: frysk-imports/antlr/configure
-diff -u frysk-imports/antlr/configure:1.1.1.1 frysk-imports/antlr/configure:1.3
+diff -u frysk-imports/antlr/configure:1.1.1.1 frysk-imports/antlr/configure:1.4
--- frysk-imports/antlr/configure:1.1.1.1 Fri Nov 25 22:29:25 2005
-+++ frysk-imports/antlr/configure Tue Nov 29 02:27:24 2005
++++ frysk-imports/antlr/configure Fri Jan 27 04:46:36 2006
@@ -2320,7 +2320,7 @@
case $LANG_JAVA in
1)
@@ -106,6 +120,15 @@
if test "x${JAR}" != "x" ; then
ax_arg_list="${JAR}"
fi
+@@ -2575,7 +2575,7 @@
+
+ case $LANG_JAVA in
+ 1)
+- jar="`basename $JAR`"
++ jar=`basename "$JAR"`
+ jar="`echo ${jar}|sed 's,\..*$,,'`"
+
+ ## This macro tries to determine which javac compiler is
@@ -2798,9 +2798,9 @@
## of course GNU. If there's a GNU compiler around we prefer
## GNU. This avoids also a problem with vendors having CC
@@ -118,10 +141,47 @@
;;
esac
+@@ -3891,7 +3891,7 @@
+ if test "x$GXX" = xyes; then
+ cxx="gcc"
+ else
+- cxx=`basename $CXX`
++ cxx=`basename "$CXX"`
+ cxx=`echo ${cxx}|sed 's,\.[^.]*$,,'`
+ fi
+
+@@ -5999,8 +5999,8 @@
+ ## get the basename of C# compiler. Depending on basename we try to
+ ## decide about the CLR.
+ test -n "${CSHARPC}" && {
+- csharpc=`basename ${CSHARPC}`
+- csharpc_d=`dirname ${CSHARPC}`
++ csharpc=`basename "${CSHARPC}"`
++ csharpc_d=`dirname "${CSHARPC}"`
+ }
+
+ case $csharpc in
+@@ -6490,11 +6490,11 @@
+ esac
+
+ ## compute basename of core libraries
+-antlr_jar=`basename ${ANTLR_JAR}`
+-antlr_net=`basename ${ANTLR_NET}`
+-antlr_lib=`basename ${ANTLR_LIB}`
+-antlr_py=`basename ${ANTLR_PY}`
+-astframe_net=`basename ${ASTFRAME_NET}`
++antlr_jar=`basename "${ANTLR_JAR}"`
++antlr_net=`basename "${ANTLR_NET}"`
++antlr_lib=`basename "${ANTLR_LIB}"`
++antlr_py=`basename "${ANTLR_PY}"`
++astframe_net=`basename "${ASTFRAME_NET}"`
+
+ test -z "${JAVA}" && {
+ JAVA=java
Index: frysk-imports/antlr/configure.in
-diff -u frysk-imports/antlr/configure.in:1.1.1.1 frysk-imports/antlr/configure.in:1.3
+diff -u frysk-imports/antlr/configure.in:1.1.1.1 frysk-imports/antlr/configure.in:1.4
--- frysk-imports/antlr/configure.in:1.1.1.1 Fri Nov 25 22:29:25 2005
-+++ frysk-imports/antlr/configure.in Tue Nov 29 02:27:24 2005
++++ frysk-imports/antlr/configure.in Fri Jan 27 04:46:36 2006
@@ -493,17 +493,17 @@
AX_JAVA_PROGS(
@@ -143,6 +203,15 @@
[
AX_VAR_HEAD([JAR])
]
+@@ -511,7 +511,7 @@
+
+ case $LANG_JAVA in
+ 1)
+- jar="`basename $JAR`"
++ jar=`basename "$JAR"`
+ jar="`echo ${jar}|sed 's,\..*$,,'`"
+
+ ## This macro tries to determine which javac compiler is
@@ -644,9 +644,9 @@
## of course GNU. If there's a GNU compiler around we prefer
## GNU. This avoids also a problem with vendors having CC
@@ -155,6 +224,43 @@
;;
esac
+@@ -671,7 +671,7 @@
+ if test "x$GXX" = xyes; then
+ cxx="gcc"
+ else
+- cxx=`basename $CXX`
++ cxx=`basename "$CXX"`
+ cxx=`echo ${cxx}|sed 's,\.@<:@^.@:>@*$,,'`
+ fi
+
+@@ -910,8 +910,8 @@
+ ## get the basename of C# compiler. Depending on basename we try to
+ ## decide about the CLR.
+ test -n "${CSHARPC}" && {
+- csharpc=`basename ${CSHARPC}`
+- csharpc_d=`dirname ${CSHARPC}`
++ csharpc=`basename "${CSHARPC}"`
++ csharpc_d=`dirname "${CSHARPC}"`
+ }
+
+ case $csharpc in
+@@ -1169,11 +1169,11 @@
+ esac
+
+ ## compute basename of core libraries
+-antlr_jar=`basename ${ANTLR_JAR}`
+-antlr_net=`basename ${ANTLR_NET}`
+-antlr_lib=`basename ${ANTLR_LIB}`
+-antlr_py=`basename ${ANTLR_PY}`
+-astframe_net=`basename ${ASTFRAME_NET}`
++antlr_jar=`basename "${ANTLR_JAR}"`
++antlr_net=`basename "${ANTLR_NET}"`
++antlr_lib=`basename "${ANTLR_LIB}"`
++antlr_py=`basename "${ANTLR_PY}"`
++astframe_net=`basename "${ASTFRAME_NET}"`
+
+ test -z "${JAVA}" && {
+ JAVA=java
Index: frysk-imports/antlr/antlr/Makefile.in
diff -u frysk-imports/antlr/antlr/Makefile.in:1.1.1.1 frysk-imports/antlr/antlr/Makefile.in:1.2
--- frysk-imports/antlr/antlr/Makefile.in:1.1.1.1 Fri Nov 25 22:29:28 2005
@@ -173,10 +279,2709 @@
## rule how to compile java files
@ANTLR_JAR@ :: $(antlr_java_FILES)
+Index: frysk-imports/antlr/scripts/config.guess
+diff -u frysk-imports/antlr/scripts/config.guess:1.1.1.1 frysk-imports/antlr/scripts/config.guess:1.2
+--- frysk-imports/antlr/scripts/config.guess:1.1.1.1 Fri Nov 25 22:29:26 2005
++++ frysk-imports/antlr/scripts/config.guess Fri Jan 27 03:21:35 2006
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+-timestamp='2001-04-20'
++timestamp='2006-01-02'
+
+ # This file is free software; you can redistribute it and/or modify it
[...2533 lines suppressed...]
++ ;;
++ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
+ ;;
+- pdp11-*)
++ pdp11-*)
+ os=-none
+ ;;
+ *-dec | vax-*)
+@@ -1184,6 +1410,9 @@
+ mips*-*)
+ os=-elf
+ ;;
++ or32-*)
++ os=-coff
++ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+@@ -1193,9 +1422,15 @@
+ *-be)
+ os=-beos
+ ;;
++ *-haiku)
++ os=-haiku
++ ;;
+ *-ibm)
+ os=-aix
+ ;;
++ *-knuth)
++ os=-mmixware
++ ;;
+ *-wec)
+ os=-proelf
+ ;;
+@@ -1247,19 +1482,19 @@
+ *-next)
+ os=-nextstep3
+ ;;
+- *-gould)
++ *-gould)
+ os=-sysv
+ ;;
+- *-highlevel)
++ *-highlevel)
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
+- *-sgi)
++ *-sgi)
+ os=-irix
+ ;;
+- *-siemens)
++ *-siemens)
+ os=-sysv4
+ ;;
+ *-masscomp)
+@@ -1328,10 +1563,16 @@
+ -mvs* | -opened*)
+ vendor=ibm
+ ;;
++ -os400*)
++ vendor=ibm
++ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+- -vxsim* | -vxworks*)
++ -tpf*)
++ vendor=ibm
++ ;;
++ -vxsim* | -vxworks* | -windiss*)
+ vendor=wrs
+ ;;
+ -aux*)
+@@ -1346,13 +1587,16 @@
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ vendor=atari
+ ;;
++ -vos*)
++ vendor=stratus
++ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+ esac
+
+ echo $basic_machine$os
+-exit 0
++exit
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+Index: frysk-imports/antlr/scripts/cpp.sh.in
+diff -u frysk-imports/antlr/scripts/cpp.sh.in:1.1.1.1 frysk-imports/antlr/scripts/cpp.sh.in:1.2
+--- frysk-imports/antlr/scripts/cpp.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005
++++ frysk-imports/antlr/scripts/cpp.sh.in Fri Jan 27 04:46:36 2006
+@@ -16,8 +16,8 @@
+ CXX="@CXX@"
+ cxx="@cxx@"
+ else
+- cxx="`basename $CXX`"
+- cxx="`echo $cxx|sed 's,\..*$,,'`"
++ cxx=`basename "$CXX"`
++ cxx=`echo $cxx|sed 's,\..*$,,'`
+ fi
+
+ ## use whitespace to separate dirs, don't use compiler specific
+Index: frysk-imports/antlr/scripts/cxx.sh.in
+diff -u frysk-imports/antlr/scripts/cxx.sh.in:1.1.1.1 frysk-imports/antlr/scripts/cxx.sh.in:1.2
+--- frysk-imports/antlr/scripts/cxx.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005
++++ frysk-imports/antlr/scripts/cxx.sh.in Fri Jan 27 04:46:36 2006
+@@ -16,8 +16,8 @@
+ CXX="@CXX@"
+ cxx="@cxx@"
+ else
+- cxx="`basename $CXX`"
+- cxx="`echo $cxx|sed 's,\..*$,,'`"
++ cxx=`basename "$CXX"`
++ cxx=`echo $cxx|sed 's,\..*$,,'`
+ fi
+
+ ## use whitespace to separate dirs, don't use compiler specific
+Index: frysk-imports/antlr/scripts/jar.sh.in
+diff -u frysk-imports/antlr/scripts/jar.sh.in:1.1.1.1 frysk-imports/antlr/scripts/jar.sh.in:1.2
+--- frysk-imports/antlr/scripts/jar.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005
++++ frysk-imports/antlr/scripts/jar.sh.in Fri Jan 27 04:46:36 2006
+@@ -32,8 +32,8 @@
+ JAR="@JAR@"
+ jar="@jar@"
+ else
+- jar="`basename $JAR`"
+- jar="`echo $jar|sed 's,\..*$,,'`"
++ jar=`basename "$JAR"`
++ jar=`echo $jar|sed 's,\..*$,,'`
+ fi
+
+ test -z "${DEBUG}" && {
Index: frysk-imports/antlr/scripts/javac.sh.in
-diff -u frysk-imports/antlr/scripts/javac.sh.in:1.1.1.1 frysk-imports/antlr/scripts/javac.sh.in:1.2
+diff -u frysk-imports/antlr/scripts/javac.sh.in:1.1.1.1 frysk-imports/antlr/scripts/javac.sh.in:1.3
--- frysk-imports/antlr/scripts/javac.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005
-+++ frysk-imports/antlr/scripts/javac.sh.in Tue Nov 29 02:40:39 2005
++++ frysk-imports/antlr/scripts/javac.sh.in Fri Jan 27 04:46:36 2006
+@@ -71,7 +71,7 @@
+ JAVAC="@JAVAC@"
+ javac="@javac@"
+ else
+- javac=`basename $JAVAC`
++ javac=`basename "$JAVAC"`
+ javac=`echo $javac|sed 's,\..*$,,'`
+ fi
+
@@ -100,7 +100,7 @@
javacflags="${javacflags} -sourcepath ${srcdir}"
javacflags="${javacflags} -classpath ${classpath}"
@@ -186,3 +2991,40 @@
javacflags="-d ."
javacflags="${javacflags} -I${srcdir} -C"
javacflags="${javacflags} -classpath ${classpath}"
+Index: frysk-imports/antlr/scripts/lib.sh.in
+diff -u frysk-imports/antlr/scripts/lib.sh.in:1.1.1.1 frysk-imports/antlr/scripts/lib.sh.in:1.2
+--- frysk-imports/antlr/scripts/lib.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005
++++ frysk-imports/antlr/scripts/lib.sh.in Fri Jan 27 04:46:36 2006
+@@ -14,8 +14,8 @@
+ AR="@AR@"
+ ar="@ar@"
+ else
+- ar="`basename $AR`"
+- ar="`echo $ar|sed 's,\..*$,,'`"
++ ar=`basename "$AR"`
++ ar=`echo $ar|sed 's,\..*$,,'`
+ fi
+
+ test -z "${DEBUG}" && {
+@@ -273,4 +273,4 @@
+ }
+ }
+
+-exit 0
+\ No newline at end of file
++exit 0
+Index: frysk-imports/antlr/scripts/link.sh.in
+diff -u frysk-imports/antlr/scripts/link.sh.in:1.1.1.1 frysk-imports/antlr/scripts/link.sh.in:1.2
+--- frysk-imports/antlr/scripts/link.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005
++++ frysk-imports/antlr/scripts/link.sh.in Fri Jan 27 04:46:36 2006
+@@ -57,8 +57,8 @@
+ LD="@CXX@"
+ ld="@cxx@"
+ else
+- ld="`basename $LD`"
+- ld="`echo $ld|sed 's,\..*$,,'`"
++ ld=`basename "$LD"`
++ ld=`echo $ld|sed 's,\..*$,,'`
+ fi
+
+ ##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx##
Index: frysk.spec
===================================================================
RCS file: /cvs/dist/rpms/frysk/FC-4/frysk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frysk.spec 24 Jan 2006 00:33:58 -0000 1.1
+++ frysk.spec 27 Jan 2006 21:10:44 -0000 1.2
@@ -8,7 +8,20 @@
# Sometimes just the libraries are wanted; sometimes not everything
# builds. Provide fine grained control.
-%define build_antlr 1
+%define build_glib2 1
+%define build_glib_java 1
+%define build_fontconfig 1
+%define build_atk 1
+%define build_cairo 1
+%define build_cairo_java 1
+%define build_pango 1
+%define build_gtk2 1
+%define build_libgtk_java 1
+%define build_libglade2 1
+%define build_libglade_java 1
+%define build_libvte_java 1
+%define build_antlr 1
+%define build_jdom 1
%define build_frysk 0
#---- cairo/fontconfig/pango defines
@@ -24,7 +37,7 @@
Summary: Frysk execution analysis tool
Name: frysk
Version: 0.0.1.2006.01.22
-Release: 0.FC4.1.1
+Release: 0.FC4.6
License: GPL + EXPLICIT EXCEPTION
Group: Development/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -107,6 +120,8 @@
%define libglade_java_version 2.12.1
%define libglade_java libglade-java-%{libglade_java_version}
Source1200: %{libglade_java}.tar.gz
+# frysk local: frysk-2213: fix 64-bit miscompile.
+Patch1290: libglade-java-20060125-fix-64bit-miscompilation.patch
# frysk local: frysk-2022: allow overriding of datadir (containing .jars)
Patch1299: libglade-java-pkg-dir.patch
@@ -255,6 +270,7 @@
# autoconf
%setup -n %{libglade_java} -q -T -b1200
+%patch1290 -p0 -b .fix-64bit-miscompilation
%patch1299 -p1 -b .pkg-dir
aclocal -I ../%{glib_java}/macros -I ../%{libgtk_java}/macros
autoconf
@@ -269,10 +285,6 @@
%setup -n %{antlr} -q -T -b100
%patch101 -p2
-# frysk local: Antlr's config.* is really really old.
-for i in $(find . -name config.guess -o -name config.sub) ; do
- [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i
-done
%setup -n %{jdom} -q -T -b1600
%patch1690 -p0
@@ -347,7 +359,7 @@
local p=%{frysk_gcc_prefix}
local s=%{frysk_gcc_suffix}
%ifarch ppc64
- local c=" -mminimal-toc"
+ local c=" -mminimal-toc -m64"
%else
local c=""
%endif
@@ -509,6 +521,8 @@
#-------------glib2----------------------------------------
+%if %{build_glib2}
+
%define glib2_builddir %{BUILDDIR}/%{glib2}
CONFIG %{glib2} \
@@ -527,8 +541,12 @@
%define lib_gthread %{glib2_builddir}/gthread/libgthread-2.0.la
%define lib_glib %{glib2_builddir}/glib/libglib-2.0.la
+%endif
+
#------------glib-java-------------------------------------
+%if %{build_glib_java}
+
%define glib_java_builddir %{BUILDDIR}/%{glib_java}
%define glib_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}"
@@ -557,8 +575,12 @@
%define lib_glibjava %{glib_java_builddir}/libglibjava.la
%define lib_glibjni %{glib_java_builddir}/libglibjni.la
+%endif
+
#-------------fontconfig-----------------------------------
+%if %{build_fontconfig}
+
%define fontconfig_builddir %{BUILDDIR}/%{fontconfig}
# Work around weird elinks bug where elinks refuses to open the
@@ -582,8 +604,12 @@
%define lib_fontconfig %{fontconfig_builddir}/src/libfontconfig.la
+%endif
+
#------------atk-------------------------------------------
+%if %{build_atk}
+
%define atk_makeflags "DEP_CFLAGS = %{GLIB_CFLAGS}" "DEP_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_glib}"
%define atk_builddir %{BUILDDIR}/%{atk}
@@ -598,8 +624,12 @@
%define ATK_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0
%define lib_atk %{atk_builddir}/atk/libatk-1.0.la
+%endif
+
#------------cairo-----------------------------------------
+%if %{build_cairo}
+
%define cairo_builddir %{BUILDDIR}/%{cairo}
CONFIG %{cairo} \
@@ -619,8 +649,12 @@
%define lib_cairo %{cairo_builddir}/src/libcairo.la
+%endif
+
#------------cairo-java------------------------------------
+%if %{build_cairo_java}
+
%define cairo_java_builddir %{BUILDDIR}/%{cairo_java}
%define cairo_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "CAIRO_LIBS = %{lib_cairo}" "%{jgjava_cflags}" "JGJAVA_LIBS = %{lib_glibjava}" "JGJNI_LIBS = %{lib_glibjni}" "%{jgjar}"
@@ -639,8 +673,12 @@
%define lib_cairojava %{cairo_java_builddir}/libcairojava.la
+%endif
+
#------------pango-----------------------------------------
+%if %{build_pango}
+
%define pango_makeflags "%{glib_cflags}" "%{cairo_cflags}" "FONTCONFIG_LIBS = %{lib_fontconfig}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "CAIRO_LIBS = %{lib_cairo}" "XFT_CFLAGS = -I$RPM_BUILD_ROOT/%{__frysk_includedir} -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config" "XFT_LIBS = -L/usr/X11R6/%{_lib} -lXft -lX11 -lfreetype -lXrender %{lib_fontconfig}"
%define pango_builddir %{BUILDDIR}/%{pango}
@@ -662,8 +700,12 @@
%define lib_pangox %{pango_builddir}/pango/libpangox-1.0.la
%define lib_pangoxft %{pango_builddir}/pango/libpangoxft-1.0.la
+%endif
+
#------------gtk2------------------------------------------
+%if %{build_gtk2}
+
%define gtk2_makeflags "GDK_PIXBUF_DEP_CFLAGS = %{GLIB_CFLAGS} -I/usr/include/libpng12" "GDK_PIXBUF_DEP_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "GDK_DEP_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API %{GLIB_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS}" "GDK_DEP_LIBS = -L/usr/X11R6/%{_lib} -lXrandr -lXrender -lXi -lXinerama -lXext -lX11 %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} %{lib_fontconfig} -ldl -lXcursor -lXrender -lXext -lXfixes -lX11 -lm" "GTK_DEP_CFLAGS = %{GLIB_CFLAGS} %{PANGO_CFLAGS} %{CAIRO_CFLAGS} %{ATK_CFLAGS}" "GTK_DEP_LIBS = -L/usr/X11R6/%{_lib} -lX11 %{lib_pangocairo} %{lib_pango} %{lib_atk} %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} %{lib_cairo} -ldl -lm" "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "GDK_PIXBUF_XLIB_DEP_CFLAGS = %{GLIB_CFLAGS} -I/usr/X11R6/include"
%define gtk2_builddir %{BUILDDIR}/%{gtk2}
@@ -693,8 +735,12 @@
%define lib_gdk_pixbuf %{gtk2_builddir}/gdk-pixbuf/libgdk_pixbuf-2.0.la
%define lib_gtk_x11 %{gtk2_builddir}/gtk/libgtk-x11-2.0.la
+%endif
+
#------------libgtk-java-----------------------------------
+%if %{build_libgtk_java}
+
%define libgtk_java_builddir %{BUILDDIR}/%{libgtk_java}
%define libgtk_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "CAIRO_LIBS = %{lib_cairo}" "%{jgjava_cflags}" "JGJAVA_LIBS = %{lib_glibjava}" "JGJNI_LIBS = %{lib_glibjni}" "%{jgjar}" "%{cairo_java_cflags}" "CAIRO_JAVA_LIBS = %{lib_cairojava}" "%{cairojar}" "GTK_CFLAGS = %{GTK_CFLAGS} %{GLIB_CFLAGS} %{ATK_CFLAGS} %{PANGO_CFLAGS}" "GTK_LIBS = -ldl %{lib_gdk_x11} %{lib_gdk_pixbuf} %{lib_gobject} %{lib_gmodule} %{lib_glib} %{lib_atk} %{libgpango} %{lib_pangocairo}" "ATK_CFLAGS = %{ATK_CFLAGS}" "ATK_LIBS = %{lib_atk}" "GTHREAD_CFLAGS = %{GLIB_CFLAGS}" "GTHREAD_LIBS = %{lib_gthread} %{lib_glib}"
@@ -715,8 +761,12 @@
%define lib_gtk_java %{libgtk_java_builddir}/libgtkjava.la
%define lib_gtkjni %{libgtk_java_builddir}/libgtkjni.la
+%endif
+
#------------libglade2--------------------------------------
+%if %{build_libglade2}
+
%define libglade2_makeflags "LIBGLADE_CFLAGS = %{GLIB_CFLAGS} %{GTK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} -I/usr/include/libxml2 %{ATK_CFLAGS}" "LIBGLADE_LIBS = -Wl,--export-dynamic -lxml2 -lpthread -lz %{lib_gtk_x11} %{lib_gdk_x11} %{lib_gdk_pixbuf} %{lib_atk} -lm %{lib_pangocairo} %{lib_pangoft2} %{lib_pango} %{lib_cairo} %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} -ldl"
%define libglade2_builddir %{BUILDDIR}/%{libglade2}
@@ -734,8 +784,12 @@
%define lib_glade %{libglade2_builddir}/glade/libglade-2.0.la
+%endif
+
#------------libglade-java---------------------------------
+%if %{build_libglade_java}
+
# REQUIRES: libgtk-java
%define libglade_java_builddir %{BUILDDIR}/%{libglade_java}
@@ -751,8 +805,12 @@
%define GLADE_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glade2.12.jar
+%endif
+
#------------libvte-java-----------------------------------
+%if %{build_libvte_java}
+
%define libvte_java_builddir %{BUILDDIR}/%{libvte_java}
%define libvte_java_makeflags %{libglade_java_makeflags} "GNOME_CFLAGS = -pthread -DORBIT2=1 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I/usr/include/ -I/usr/include/freetype2 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2" "GNOME_LIBS = -Wl,--export-dynamic -pthread -L/usr/X11R6/%{_lib} -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lxml2 -lpthread -lz -lgnome-2 -lpopt -lbonobo-2 -lgconf-2!
-lgnomevfs-2 -lbonobo-activation -lORBit-2 %{lib_gthread} -lgnomecanvas-2 -lart_lgpl_2 %{lib_pangoft2} %{lib_gtk_x11} %{lib_gdk_x11} %{lib_atk} -lgdk_pixbuf-2.0 -lm %{lib_pangocairo} %{lib_pango} %{lib_cairo} %{lib_gobject} %{lib_gmodule} -ldl %{lib_glib}" "VTE_CFLAGS = -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I/usr/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include -I$RPM_BUILD_DIR/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo" "VTE_LIBS = -L/usr/X11R6/%{_lib} -lvte -lz -lncurses -lSM -lICE -lXft -lX11 -lfreetype -lXrender %{lib_gtk_x11} %{lib_pangoxft} %{lib_pangox} %{lib_fontconfig} %{lib_gdk_x11} %{lib_atk} %{lib_gdk_pixbuf} -lm %{lib_pangocairo} %{lib_cairo} %{lib_pangoft2} %{lib_pango} %{lib_gobj!
ect} %{lib_gmodule} -ldl %{lib_glib}" "JGJAVA_CFLAGS = %{JGJA!
VA_CFLAG
S} -I $RPM_BUILD_ROOT/%{__frysk_includedir}"
@@ -765,6 +823,8 @@
%define VTE_JAVA_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/vte0.11.jar
+%endif
+
#-----------antlr------------------------------------------
%if %{build_antlr}
@@ -789,6 +849,8 @@
#-----------jdom------------------------------------------
+%if %{build_jdom}
+
%define jdom_builddir %{BUILDDIR}/%{jdom}
export JDOM_JAR=$RPM_BUILD_ROOT/%{__frysk_datadir}/java/jdom.jar
@@ -816,9 +878,12 @@
INSTALLED %{jdom}
fi
+%endif
+
#-----------frysk------------------------------------------
%if %{build_frysk}
+
%define frysk_builddir %{BUILDDIR}/%{frysk}
%define frysk_rpaths -Djava.library.path=%{__frysk_libdir}: -Wl,-rpath,%{__frysk_libdir}:
@@ -832,6 +897,7 @@
%{__frysk_configure}
BUILD %{frysk} %{?_smp_mflags} %{frysk_makeflags}
INSTALL %{frysk} %{frysk_makeflags}
+
%endif
#-----------done------------------------------------------
@@ -853,23 +919,45 @@
%files
%defattr(-,root,root)
-/usr/bin/*
+%{_bindir}/*
+%{_mandir}/*/frysk-*
+%{_includedir}/frysk/*
+%{_libdir}/frysk/*
+%{_datadir}/frysk/*
+%{_sysconfdir}/*
%if %{build_frysk}
-/usr/%{_lib}/libEggTrayIcon.so
-/usr/%{_lib}/libfrysk-*.so
-/usr/%{_lib}/libftk*.so
-/usr/share/java/frysk-*.jar
-/usr/share/java/ftk.jar
-/usr/share/applications/frysk.desktop
-/usr/share/pixmaps/fryskTrayIcon48.png
+%{_libdir}/libEggTrayIcon.so
+%{_libdir}/libfrysk-*.so
+%{_libdir}/libftk*.so
+%{_datadir}/java/frysk-*.jar
+%{_datadir}/java/ftk.jar
+%{_datadir}/applications/frysk.desktop
+%{_datadir}/pixmaps/fryskTrayIcon48.png
%endif
-/usr/share/man/*/frysk-*
-/usr/include/frysk/*
-/usr/%{_lib}/frysk/*
-/usr/share/frysk/*
-/etc/frysk/*
%changelog
+* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.6
+- Add the macros build_glib2, build_glib_java, build_fontconfig,
+ build_atk, build_cairo, build_cairo_java, build_pango, build_gtk2,
+ build_libgtk_java, build_libglade2, build_libglade_java,
+ build_libvte_java, and build_jdom. Wrap corresponding build code.
+
+* Fri Jan 27 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.5
+- Update antlr.patch, update includes Wu Zhou's basename fix, and
+ up-to-date config.guess and config.sub.
+
+* Thu Jan 26 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.4
+- From Diego Novello <dnovillo at redhat.com>: Add
+ libglade-java-20060125-fix-64bit-miscompilation.patch.
+
+* Thu Jan 26 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.3
+- From Wu Zhou <woodzltc at cn.ibm.com>: Add -m64 to ppc64 CC et.al.
+
+* Mon Jan 23 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.2
+- In -files, only list frysk.desktop and fryskTrayIcon48.png when
+ build_frysk.
+- Define all install paths in terms of macros.
+
* Mon Jan 23 2006 Andrew Cagney <cagney at redhat.com> 0.0.1.2006.01.22-0.EL4.1
- Write pango.modules to %{_target_platform}, instead of %{_host}
sub-directory.
- Previous message (by thread): rpms/kernel/devel linux-2.6-suspend-memhotplug-oops.patch, NONE, 1.1 kernel-2.6.spec, 1.1880, 1.1881
- Next message (by thread): rpms/microcode_ctl/devel .cvsignore, 1.4, 1.5 microcode_ctl.patch, 1.5, 1.6 microcode_ctl.spec, 1.28, 1.29 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list