rpms/blam/F-9 blam-xulrunner-configure.patch, NONE, 1.1 blam.spec, 1.21, 1.22
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Fri Jun 27 10:12:33 UTC 2008
- Previous message (by thread): rpms/anthy/F-9 anthy-9100e-fix-segfault-vu.patch, NONE, 1.1 anthy.spec, 1.47, 1.48
- Next message (by thread): rpms/bluez-utils/devel .cvsignore, 1.37, 1.38 bluez-utils.spec, 1.106, 1.107 sources, 1.37, 1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stransky
Update of /cvs/pkgs/rpms/blam/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15619
Modified Files:
blam.spec
Added Files:
blam-xulrunner-configure.patch
Log Message:
Rebuild against new xulrunner
blam-xulrunner-configure.patch:
--- NEW FILE blam-xulrunner-configure.patch ---
diff -up blam-1.8.3/configure.old blam-1.8.3/configure
--- blam-1.8.3/configure.old 2006-11-17 01:29:56.000000000 +0100
+++ blam-1.8.3/configure 2008-06-23 10:08:35.000000000 +0200
@@ -22092,6 +22092,8 @@ fi
echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6; }
MOZILLA=
+MOZILLA_XPCOM=
+MOZILLA_GTKMOZEMBED=
# Check whether --with-mozilla was given.
if test "${with_mozilla+set}" = set; then
@@ -22100,16 +22102,30 @@ fi
if test "x$MOZILLA" = "x"; then
- if pkg-config --exists mozilla-gtkmozembed; then
- MOZILLA=mozilla
+ if pkg-config --exists libxul; then
+ MOZILLA=libxul
+ MOZILLA_XPCOM=libxul
+ MOZILLA_GTKMOZEMBED=mozilla-gtkmozembed
elif pkg-config --exists firefox-gtkmozembed; then
MOZILLA=firefox
+ MOZILLA_XPCOM=firefox-xpcom
+ MOZILLA_GTKMOZEMBED=firefox-gtkmozembed
elif pkg-config --exists thunderbird-gtkmozembed; then
MOZILLA=thunderbird
+ MOZILLA_XPCOM=thunderbird-xpcom
+ MOZILLA_GTKMOZEMBED=thunderbird-gtkmozembed
elif pkg-config --exists xulrunner-gtkmozembed; then
MOZILLA=xulrunner
+ MOZILLA_XPCOM=xulrunner-xpcom
+ MOZILLA_GTKMOZEMBED=xulrunner-gtkmozembed
elif pkg-config --exists seamonkey-gtkmozembed; then
MOZILLA=seamonkey
+ MOZILLA_XPCOM=seamonkey-xpcom
+ MOZILLA_GTKMOZEMBED=seamonkey-gtkmozembed
+elif pkg-config --exists mozilla-gtkmozembed; then
+ MOZILLA=mozilla
+ MOZILLA_XPCOM=mozilla-xpcom
+ MOZILLA_GTKMOZEMBED=mozilla-gtkmozembed
else
{ { echo "$as_me:$LINENO: error: no mozilla installation found" >&5
echo "$as_me: error: no mozilla installation found" >&2;}
@@ -22131,13 +22147,12 @@ mozilla) min_version=1.7 flavour=mozilla
firefox) min_version=0.10 flavour=toolkit ;;
thunderbird) min_version=0.8 flavour=toolkit ;;
xulrunner) min_version=1.8 flavour=toolkit ;;
+libxul) min_version=1.8 flavour=toolkit ;;
seamonkey) min_version=1.0 flavour=mozilla ;;
esac
MOZILLA_FLAVOUR=$flavour
-
-
pkg_failed=no
{ echo "$as_me:$LINENO: checking for MOZILLA_COMPONENT" >&5
echo $ECHO_N "checking for MOZILLA_COMPONENT... $ECHO_C" >&6; }
@@ -22147,12 +22162,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA_GTKMOZEMBED >= \$min_version \$MOZILLA_XPCOM >= \$min_version\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null`
+ pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22165,12 +22180,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA_GTKMOZEMBED >= \$min_version \$MOZILLA_XPCOM >= \$min_version\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null`
+ pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22189,14 +22204,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version"`
+ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version"`
else
- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version"`
+ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version"`
fi
# Put the nasty error message in config.log where it belongs
echo "$MOZILLA_COMPONENT_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met:
$MOZILLA_COMPONENT_PKG_ERRORS
@@ -22207,7 +22222,7 @@ Alternatively, you may set the environme
and MOZILLA_COMPONENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met:
+echo "$as_me: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met:
$MOZILLA_COMPONENT_PKG_ERRORS
@@ -22251,13 +22266,13 @@ fi
-MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`"
+MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA_GTKMOZEMBED`"
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
+MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA_GTKMOZEMBED`"
-MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA-gtkmozembed`"
+MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA_GTKMOZEMBED`"
ac_ext=cpp
@@ -22333,7 +22348,7 @@ fi
-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
+CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA_XPCOM`"
{ echo "$as_me:$LINENO: checking whether nsIFilePicker methods expect nsAString&" >&5
@@ -22598,16 +22613,16 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- \$MOZILLA-gtkmozembed\"") >&5
+ \$MOZILLA_GTKMOZEMBED\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed") 2>&5
+ $MOZILLA_GTKMOZEMBED") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBBLAM_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed" 2>/dev/null`
+ $MOZILLA_GTKMOZEMBED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22622,16 +22637,16 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- \$MOZILLA-gtkmozembed\"") >&5
+ \$MOZILLA_GTKMOZEMBED\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed") 2>&5
+ $MOZILLA_GTKMOZEMBED") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBBLAM_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed" 2>/dev/null`
+ $MOZILLA_GTKMOZEMBED" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22652,18 +22667,18 @@ fi
if test $_pkg_short_errors_supported = yes; then
LIBBLAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed"`
+ $MOZILLA_GTKMOZEMBED"`
else
LIBBLAM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed"`
+ $MOZILLA_GTKMOZEMBED"`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBBLAM_PKG_ERRORS" >&5
{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed) were not met:
+ $MOZILLA_GTKMOZEMBED) were not met:
$LIBBLAM_PKG_ERRORS
@@ -22676,7 +22691,7 @@ See the pkg-config man page for more det
" >&5
echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed) were not met:
+ $MOZILLA_GTKMOZEMBED) were not met:
$LIBBLAM_PKG_ERRORS
Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/F-9/blam.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- blam.spec 19 Feb 2008 19:15:04 -0000 1.21
+++ blam.spec 27 Jun 2008 10:11:34 -0000 1.22
@@ -5,7 +5,7 @@
Name: blam
Version: 1.8.3
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: An RSS/RDF feed reader
Group: Applications/Internet
@@ -19,6 +19,7 @@
Patch2: %{name}-fix-THEME_DIR-path.patch
Patch3: %{name}-CVE-2005-4790.patch
Patch4: %{name}-xulrunner.patch
+Patch5: %{name}-xulrunner-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## Various Mono dependencies are not available for ppc64; see bug 241850.
@@ -68,6 +69,7 @@
%patch2 -p0 -b .fix-THEME_DIR-path
%patch3 -p1 -b .CVE-2005-4790
%patch4 -p1 -b .xl
+%patch5 -p1 -b .xlc
%build
export CFLAGS="%{optflags} -debug"
@@ -130,6 +132,9 @@
%{_mandir}/man?/%{name}.1*
%changelog
+* Fri Jun 20 2008 Martin Stransky <stransky at redhat.com> - 1.8.3-15
+- rebuild agains final XUL Runner (gecko-libs 1.9)
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.8.3-14
- Autorebuild for GCC 4.3
- Previous message (by thread): rpms/anthy/F-9 anthy-9100e-fix-segfault-vu.patch, NONE, 1.1 anthy.spec, 1.47, 1.48
- Next message (by thread): rpms/bluez-utils/devel .cvsignore, 1.37, 1.38 bluez-utils.spec, 1.106, 1.107 sources, 1.37, 1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list