rpms/devhelp/devel .cvsignore, 1.18, 1.19 devhelp-0.19-xulrunner.patch, 1.1, 1.2 devhelp.spec, 1.88, 1.89 sources, 1.18, 1.19
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Mon May 26 16:29:05 UTC 2008
- Previous message: rpms/samba/F-9 samba-3.2.0rc1-capget.diff,NONE,1.1
- Next message: rpms/samba/devel samba-3.2.0rc1-capget.diff, NONE, 1.1 .cvsignore, 1.47, 1.48 samba.spec, 1.151, 1.152 sources, 1.51, 1.52 samba-3.2.0pre2-roreloc.diff, 1.1, NONE samba-3.2.0pre3-join.diff, 1.1, NONE samba-3.2.0pre3-smbclient.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/pkgs/rpms/devhelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11149
Modified Files:
.cvsignore devhelp-0.19-xulrunner.patch devhelp.spec sources
Log Message:
* Mon May 26 2008 Matthew Barnes <mbarnes at redhat.com> - 0.19.1-1
- Update to 0.19.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 7 Feb 2008 13:39:21 -0000 1.18
+++ .cvsignore 26 May 2008 16:28:09 -0000 1.19
@@ -1 +1 @@
-devhelp-0.19.tar.bz2
+devhelp-0.19.1.tar.bz2
devhelp-0.19-xulrunner.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 devhelp-0.19-xulrunner.patch
Index: devhelp-0.19-xulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp-0.19-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- devhelp-0.19-xulrunner.patch 26 Feb 2008 11:26:58 -0000 1.1
+++ devhelp-0.19-xulrunner.patch 26 May 2008 16:28:09 -0000 1.2
@@ -1,99 +1,6 @@
-diff -up devhelp-0.19/m4/gecko.m4.xl devhelp-0.19/m4/gecko.m4
---- devhelp-0.19/m4/gecko.m4.xl 2007-02-13 09:34:26.000000000 +0100
-+++ devhelp-0.19/m4/gecko.m4 2008-02-26 12:10:21.000000000 +0100
-@@ -51,22 +51,32 @@ AC_PROG_AWK
- AC_MSG_CHECKING([which gecko to use])
-
- AC_ARG_WITH([gecko],
-- AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
-+ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul@:>@],
- [Which gecko engine to use (autodetected by default)]))
-
- # Backward compat
- AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[])
-
- gecko_cv_gecko=$with_gecko
-+if $PKG_CONFIG --exists $with_gecko-xpcom; then
-+ gecko_cv_gecko_xpcom=$with_gecko-xpcom
-+else
-+ gecko_cv_gecko_xpcom=$with_gecko
-+fi
-
- # Autodetect gecko
--_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"
-+_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul"
- if test -z "$gecko_cv_gecko"; then
- for lizard in $_geckos; do
- if $PKG_CONFIG --exists $lizard-xpcom; then
- gecko_cv_gecko=$lizard
-+ gecko_cv_gecko_xpcom=$lizard-xpcom
- break;
-- fi
-+ elif $PKG_CONFIG --exists $lizard; then
-+ gecko_cv_gecko=$lizard
-+ gecko_cv_gecko_xpcom=$lizard
-+ break;
-+ fi
- done
- fi
-
-@@ -93,12 +103,13 @@ mozilla) gecko_cv_gecko_flavour=mozilla
- seamonkey) gecko_cv_gecko_flavour=mozilla ;;
- *firefox) gecko_cv_gecko_flavour=toolkit ;;
- xulrunner) gecko_cv_gecko_flavour=toolkit ;;
-+libxul*) gecko_cv_gecko_flavour=toolkit ;;
- esac
-
--_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
--_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
--_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
--_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
-+_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko_xpcom}`"
-+_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
-+_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
-+_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko_xpcom}`"
-
- fi # if gecko_cv_have_gecko
-
-@@ -114,6 +125,7 @@ $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
- $1[]_LIBDIR=$_GECKO_LIBDIR
- $1[]_HOME=$_GECKO_HOME
- $1[]_PREFIX=$_GECKO_PREFIX
-+$1[]_XPCOM=$gecko_cv_gecko_xpcom
-
- # **************************************************************
- # This is really gcc-only
-@@ -359,10 +371,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
- _SAVE_CXXFLAGS="$CXXFLAGS"
- _SAVE_LDFLAGS="$LDFLAGS"
- _SAVE_LIBS="$LIBS"
--CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
--CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
-+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})"
-+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})"
- LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
--LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
-+LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})"
-
- _GECKO_DISPATCH_INCLUDEDIRS="$2"
-
-@@ -595,11 +607,11 @@ fi
- AC_DEFUN([GECKO_XPIDL],
- [AC_REQUIRE([GECKO_INIT])dnl
-
--_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
-+_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
-
- AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
-
--XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
-+XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko_xpcom}`"
-
- # Older geckos don't have this variable, see
- # https://bugzilla.mozilla.org/show_bug.cgi?id=240473
-diff -up devhelp-0.19/configure.in.xl devhelp-0.19/configure.in
---- devhelp-0.19/configure.in.xl 2008-02-07 10:18:55.000000000 +0100
-+++ devhelp-0.19/configure.in 2008-02-26 12:11:01.000000000 +0100
+diff -up devhelp-0.19.1/configure.in.xulrunner devhelp-0.19.1/configure.in
+--- devhelp-0.19.1/configure.in.xulrunner 2008-05-25 12:56:13.000000000 -0400
++++ devhelp-0.19.1/configure.in 2008-05-26 12:18:07.000000000 -0400
@@ -73,6 +73,7 @@ AC_SUBST([GECKO_INCLUDE_ROOT])
AC_SUBST([GECKO_HOME])
AC_SUBST([GECKO_PREFIX])
@@ -114,10 +21,19 @@
AC_SUBST([GECKO_CFLAGS])
AC_SUBST([GECKO_LIBS])
-diff -up devhelp-0.19/configure.xl devhelp-0.19/configure
---- devhelp-0.19/configure.xl 2008-02-07 13:39:49.000000000 +0100
-+++ devhelp-0.19/configure 2008-02-26 12:14:58.000000000 +0100
-@@ -940,6 +940,7 @@ GECKO_INCLUDE_ROOT
+diff -up devhelp-0.19.1/configure.xulrunner devhelp-0.19.1/configure
+--- devhelp-0.19.1/configure.xulrunner 2008-05-25 12:56:28.000000000 -0400
++++ devhelp-0.19.1/configure 2008-05-26 12:19:15.000000000 -0400
+@@ -869,8 +869,6 @@ LN_S
+ ECHO
+ AR
+ RANLIB
+-DSYMUTIL
+-NMEDIT
+ CXXCPP
+ F77
+ FFLAGS
+@@ -945,6 +943,7 @@ GECKO_INCLUDE_ROOT
GECKO_HOME
GECKO_PREFIX
GECKO_EXTRA_LIBS
@@ -125,7 +41,7 @@
GECKO_CFLAGS
GECKO_LIBS
GECKO_WARN_CXXFLAGS
-@@ -1597,7 +1598,7 @@ Optional Packages:
+@@ -1600,7 +1599,7 @@ Optional Packages:
--with-gconf-source=sourceaddress Config database for installing schema files.
--with-gconf-schema-file-dir=dir Directory for installing schema files.
--with-compile-warnings=no/yes/error Compiler warnings
@@ -134,7 +50,16 @@
Which gecko engine to use (autodetected by default)
--with-zlib=DIR use libz in DIR
-@@ -5357,7 +5358,7 @@ linux* | k*bsd*-gnu)
+@@ -5265,7 +5264,7 @@ lt_cv_deplibs_check_method='unknown'
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix[4-9]*)
++aix4* | aix5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -5360,7 +5359,7 @@ linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -143,16 +68,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5477,7 +5478,7 @@ ia64-*-hpux*)
+@@ -5480,7 +5479,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 5480 "configure"' > conftest.$ac_ext
-+ echo '#line 5481 "configure"' > conftest.$ac_ext
+- echo '#line 5483 "configure"' > conftest.$ac_ext
++ echo '#line 5482 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -5542,6 +5543,7 @@ s390*-*linux*|sparc*-*linux*)
+@@ -5545,6 +5544,7 @@ s390*-*linux*|sparc*-*linux*)
esac
;;
*64-bit*)
@@ -160,49 +85,504 @@
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -7342,11 +7344,11 @@ else
+@@ -5652,11 +5652,7 @@ sparc*-*solaris*)
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *)
+- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+- LD="${LD-ld} -64"
+- fi
+- ;;
++ *) LD="${LD-ld} -64" ;;
+ esac
+ ;;
[...1896 lines suppressed...]
+- fi
+-else
+- pkg_failed=untried
++ else
++ pkg_failed=untried
+ fi
+
+
+@@ -22207,14 +21786,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version"`
-+ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version"`
++ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version" 2>&1`
else
- GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version"`
-+ GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version"`
++ GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GECKO_PKG_ERRORS" >&5
@@ -679,7 +2067,7 @@
$GECKO_PKG_ERRORS
-@@ -21707,7 +21677,7 @@ Alternatively, you may set the environme
+@@ -22225,7 +21804,7 @@ Alternatively, you may set the environme
and GECKO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -688,7 +2076,7 @@
$GECKO_PKG_ERRORS
-@@ -21781,10 +21751,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -22299,10 +21878,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
@@ -702,7 +2090,7 @@
_GECKO_DISPATCH_INCLUDEDIRS="content"
-@@ -21888,10 +21858,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -22406,10 +21985,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
_SAVE_CXXFLAGS="$CXXFLAGS"
_SAVE_LDFLAGS="$LDFLAGS"
_SAVE_LIBS="$LIBS"
@@ -716,7 +2104,16 @@
_GECKO_DISPATCH_INCLUDEDIRS=""
-@@ -25056,6 +25026,7 @@ GECKO_INCLUDE_ROOT!$GECKO_INCLUDE_ROOT$a
+@@ -25503,8 +25082,6 @@ for ac_last_try in false false false fal
+ ECHO!$ECHO$ac_delim
+ AR!$AR$ac_delim
+ RANLIB!$RANLIB$ac_delim
+-DSYMUTIL!$DSYMUTIL$ac_delim
+-NMEDIT!$NMEDIT$ac_delim
+ CXXCPP!$CXXCPP$ac_delim
+ F77!$F77$ac_delim
+ FFLAGS!$FFLAGS$ac_delim
+@@ -25579,6 +25156,7 @@ GECKO_INCLUDE_ROOT!$GECKO_INCLUDE_ROOT$a
GECKO_HOME!$GECKO_HOME$ac_delim
GECKO_PREFIX!$GECKO_PREFIX$ac_delim
GECKO_EXTRA_LIBS!$GECKO_EXTRA_LIBS$ac_delim
@@ -724,28 +2121,121 @@
GECKO_CFLAGS!$GECKO_CFLAGS$ac_delim
GECKO_LIBS!$GECKO_LIBS$ac_delim
GECKO_WARN_CXXFLAGS!$GECKO_WARN_CXXFLAGS$ac_delim
-@@ -25078,7 +25049,6 @@ POFILES!$POFILES$ac_delim
+@@ -25597,6 +25175,7 @@ PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$a
+ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+ POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
- MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
- PYTHON!$PYTHON$ac_delim
--PYTHON_VERSION!$PYTHON_VERSION$ac_delim
++MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -25120,6 +25090,7 @@ _ACEOF
+@@ -25638,7 +25217,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+PYTHON_VERSION!$PYTHON_VERSION$ac_delim
+-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+ PYTHON!$PYTHON$ac_delim
+ PYTHON_VERSION!$PYTHON_VERSION$ac_delim
PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
- PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
- PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
-@@ -25131,7 +25102,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -25652,7 +25230,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -up devhelp-0.19.1/m4/gecko.m4.xulrunner devhelp-0.19.1/m4/gecko.m4
+--- devhelp-0.19.1/m4/gecko.m4.xulrunner 2008-05-25 12:55:36.000000000 -0400
++++ devhelp-0.19.1/m4/gecko.m4 2008-05-26 12:18:07.000000000 -0400
+@@ -51,22 +51,32 @@ AC_PROG_AWK
+ AC_MSG_CHECKING([which gecko to use])
+
+ AC_ARG_WITH([gecko],
+- AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
++ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul@:>@],
+ [Which gecko engine to use (autodetected by default)]))
+
+ # Backward compat
+ AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[])
+
+ gecko_cv_gecko=$with_gecko
++if $PKG_CONFIG --exists $with_gecko-xpcom; then
++ gecko_cv_gecko_xpcom=$with_gecko-xpcom
++else
++ gecko_cv_gecko_xpcom=$with_gecko
++fi
+
+ # Autodetect gecko
+-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"
++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul"
+ if test -z "$gecko_cv_gecko"; then
+ for lizard in $_geckos; do
+ if $PKG_CONFIG --exists $lizard-xpcom; then
+ gecko_cv_gecko=$lizard
++ gecko_cv_gecko_xpcom=$lizard-xpcom
+ break;
+- fi
++ elif $PKG_CONFIG --exists $lizard; then
++ gecko_cv_gecko=$lizard
++ gecko_cv_gecko_xpcom=$lizard
++ break;
++ fi
+ done
+ fi
+
+@@ -93,12 +103,13 @@ mozilla) gecko_cv_gecko_flavour=mozilla
+ seamonkey) gecko_cv_gecko_flavour=mozilla ;;
+ *firefox) gecko_cv_gecko_flavour=toolkit ;;
+ xulrunner) gecko_cv_gecko_flavour=toolkit ;;
++libxul*) gecko_cv_gecko_flavour=toolkit ;;
+ esac
+
+-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
++_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko_xpcom}`"
++_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
++_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
++_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko_xpcom}`"
+
+ fi # if gecko_cv_have_gecko
+
+@@ -114,6 +125,7 @@ $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
+ $1[]_LIBDIR=$_GECKO_LIBDIR
+ $1[]_HOME=$_GECKO_HOME
+ $1[]_PREFIX=$_GECKO_PREFIX
++$1[]_XPCOM=$gecko_cv_gecko_xpcom
+
+ # **************************************************************
+ # This is really gcc-only
+@@ -359,10 +371,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})"
++CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})"
+ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})"
+
+ _GECKO_DISPATCH_INCLUDEDIRS="$2"
+
+@@ -595,11 +607,11 @@ fi
+ AC_DEFUN([GECKO_XPIDL],
+ [AC_REQUIRE([GECKO_INIT])dnl
+
+-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
+
+ AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
+
+-XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
++XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko_xpcom}`"
+
+ # Older geckos don't have this variable, see
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=240473
Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/devhelp.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- devhelp.spec 4 May 2008 23:43:56 -0000 1.88
+++ devhelp.spec 26 May 2008 16:28:09 -0000 1.89
@@ -6,8 +6,8 @@
### Abstract ###
Name: devhelp
-Version: 0.19
-Release: 5%{?dist}
+Version: 0.19.1
+Release: 1%{?dist}
License: GPLv2+
Group: Development/Tools
Summary: API document browser
@@ -51,7 +51,7 @@
%prep
%setup -q -n devhelp-%{version}
-%patch -p1 -b .xl
+%patch -p1 -b .xulrunner
%build
%configure --disable-static
@@ -135,6 +135,9 @@
%{_libdir}/pkgconfig/*
%changelog
+* Mon May 26 2008 Matthew Barnes <mbarnes at redhat.com> - 0.19.1-1
+- Update to 0.19.1
+
* Sun May 4 2008 Matthias Clasen <mclasen at redhat.com> - 0.19-5
- Fix source url
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 7 Feb 2008 13:39:21 -0000 1.18
+++ sources 26 May 2008 16:28:09 -0000 1.19
@@ -1 +1 @@
-66c9fb480e123c96eb1efdbad56b2d90 devhelp-0.19.tar.bz2
+6c12a272a94ac9cfc1dc6234590b46d8 devhelp-0.19.1.tar.bz2
- Previous message: rpms/samba/F-9 samba-3.2.0rc1-capget.diff,NONE,1.1
- Next message: rpms/samba/devel samba-3.2.0rc1-capget.diff, NONE, 1.1 .cvsignore, 1.47, 1.48 samba.spec, 1.151, 1.152 sources, 1.51, 1.52 samba-3.2.0pre2-roreloc.diff, 1.1, NONE samba-3.2.0pre3-join.diff, 1.1, NONE samba-3.2.0pre3-smbclient.diff, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list