[ease/f14] Revert parts of cherry-picked changes: on Fedora 14, use rest{, -extras}-0.6, not 0.7
Michel Alexandre Salim
salimma at fedoraproject.org
Sat Aug 13 21:21:39 UTC 2011
commit 96049dcdae84dbfd9579b6956fc0e5befedbbeb1
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Sat Aug 13 23:20:43 2011 +0200
Revert parts of cherry-picked changes: on Fedora 14, use
rest{,-extras}-0.6, not 0.7
ease-0.4-dependencies.patch | 168 ++++++++++++++++---------------------------
ease.spec | 4 +-
2 files changed, 65 insertions(+), 107 deletions(-)
---
diff --git a/ease-0.4-dependencies.patch b/ease-0.4-dependencies.patch
index e48bf2c..ed1988e 100644
--- a/ease-0.4-dependencies.patch
+++ b/ease-0.4-dependencies.patch
@@ -1,103 +1,6 @@
---- ease-0.4/configure.ac 2010-10-16 00:40:22.000000000 +0200
-+++ ease-0.4/configure.ac 2011-02-21 11:11:52.000000000 +0100
-@@ -60,8 +60,8 @@ pkg_modules="\
- json-glib-1.0 >= 0.7.6\
- libarchive\
- poppler-glib\
-- rest-0.6 \
-- rest-extras-0.6\
-+ rest-0.7 \
-+ rest-extras-0.7\
- unique-1.0"
-
- PKG_CHECK_MODULES(EASE, [$pkg_modules])
-@@ -74,7 +74,7 @@ EASE_PACKAGES="\
- --pkg json-glib-1.0\
- --pkg libarchive\
- --pkg poppler-glib\
-- --pkg rest-extras-0.6\
-+ --pkg rest-extras-0.7\
- --pkg unique-1.0"
-
- AC_SUBST(EASE_CFLAGS)
---- ease-0.4/configure 2010-10-16 00:40:29.000000000 +0200
-+++ ease-0.4/configure 2011-02-21 11:12:04.000000000 +0100
-@@ -9095,7 +9095,7 @@ $as_echo_n "checking whether the $compil
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-- export_dynamic_flag_spec='${wl}--export-dynamic'
-+ export_dynamic_flag_spec='${wl}-export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-@@ -12013,8 +12013,8 @@ pkg_modules="\
- json-glib-1.0 >= 0.7.6\
- libarchive\
- poppler-glib\
-- rest-0.6 \
-- rest-extras-0.6\
-+ rest-0.7 \
-+ rest-extras-0.7\
- unique-1.0"
-
-
-@@ -12115,7 +12115,7 @@ EASE_PACKAGES="\
- --pkg json-glib-1.0\
- --pkg libarchive\
- --pkg poppler-glib\
-- --pkg rest-extras-0.6\
-+ --pkg rest-extras-0.7\
- --pkg unique-1.0"
-
-
---- ease-0.4/ease-core/Makefile.am 2010-09-25 20:23:47.000000000 +0200
-+++ ease-0.4/ease-core/Makefile.am 2011-02-21 11:14:07.000000000 +0100
-@@ -89,7 +89,7 @@ libease_core_ at EASE_CORE_VERSION@_la_CFLA
-
- libease_core_ at EASE_CORE_VERSION@_la_LDFLAGS = \
- $(EASE_LDFLAGS) \
-- --export-dynamic \
-+ -export-dynamic \
- $(NULL)
-
- # header installation
---- ease-0.4/ease-core/Makefile.in 2010-10-16 00:40:29.000000000 +0200
-+++ ease-0.4/ease-core/Makefile.in 2011-02-21 11:14:04.000000000 +0100
-@@ -448,7 +448,7 @@ libease_core_ at EASE_CORE_VERSION@_la_CFLA
-
- libease_core_ at EASE_CORE_VERSION@_la_LDFLAGS = \
- $(EASE_LDFLAGS) \
-- --export-dynamic \
-+ -export-dynamic \
- $(NULL)
-
-
---- ease-0.4/ease/Makefile.am 2010-10-15 21:26:31.000000000 +0200
-+++ ease-0.4/ease/Makefile.am 2011-02-21 11:14:01.000000000 +0100
-@@ -47,7 +47,7 @@ ease_CFLAGS = \
- -I$(top_srcdir)/flutter \
- -include $(top_srcdir)/config.h
-
--ease_LDFLAGS = $(EASE_LIBS) --export-dynamic
-+ease_LDFLAGS = $(EASE_LIBS) -export-dynamic
-
- ease_LDADD = \
- $(top_builddir)/ease-core/libease-core- at EASE_CORE_VERSION@.la \
---- ease-0.4/ease/Makefile.in 2010-10-16 00:40:29.000000000 +0200
-+++ ease-0.4/ease/Makefile.in 2011-02-21 11:13:57.000000000 +0100
-@@ -338,7 +338,7 @@ ease_CFLAGS = \
- -I$(top_srcdir)/flutter \
- -include $(top_srcdir)/config.h
-
--ease_LDFLAGS = $(EASE_LIBS) --export-dynamic
-+ease_LDFLAGS = $(EASE_LIBS) -export-dynamic
- ease_LDADD = \
- $(top_builddir)/ease-core/libease-core- at EASE_CORE_VERSION@.la \
- $(top_builddir)/flutter/libflutter- at FLUTTER_VERSION@.la \
---- ease-0.4/m4/libtool.m4 2010-10-15 21:25:15.000000000 +0200
-+++ ease-0.4/m4/libtool.m4 2011-02-21 11:13:32.000000000 +0100
-@@ -4276,7 +4276,7 @@ dnl Note also adjust exclude_expsyms for
+--- ease-0.4/m4/libtool.m4.dependencies 2010-10-15 21:25:15.000000000 +0200
++++ ease-0.4/m4/libtool.m4 2011-08-13 23:15:51.424665502 +0200
+@@ -4276,7 +4276,7 @@
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -106,7 +9,7 @@
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-@@ -5455,7 +5455,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5455,7 +5455,7 @@
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -115,7 +18,7 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-@@ -5882,7 +5882,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5882,7 +5882,7 @@
output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -124,7 +27,7 @@
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-@@ -5910,7 +5910,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5910,7 +5910,7 @@
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -133,7 +36,7 @@
_LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
pgCC* | pgcpp*)
-@@ -5942,7 +5942,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5942,7 +5942,7 @@
esac
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
@@ -142,7 +45,7 @@
_LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
;;
cxx*)
-@@ -5967,7 +5967,7 @@ if test "$_lt_caught_CXX_error" != yes;
+@@ -5967,7 +5967,7 @@
xl*)
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -151,3 +54,58 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+--- ease-0.4/ease-core/Makefile.am.dependencies 2010-09-25 20:23:47.000000000 +0200
++++ ease-0.4/ease-core/Makefile.am 2011-08-13 23:15:51.407665286 +0200
+@@ -89,7 +89,7 @@
+
+ libease_core_ at EASE_CORE_VERSION@_la_LDFLAGS = \
+ $(EASE_LDFLAGS) \
+- --export-dynamic \
++ -export-dynamic \
+ $(NULL)
+
+ # header installation
+--- ease-0.4/ease-core/Makefile.in.dependencies 2010-10-16 00:40:29.000000000 +0200
++++ ease-0.4/ease-core/Makefile.in 2011-08-13 23:15:51.415665386 +0200
+@@ -448,7 +448,7 @@
+
+ libease_core_ at EASE_CORE_VERSION@_la_LDFLAGS = \
+ $(EASE_LDFLAGS) \
+- --export-dynamic \
++ -export-dynamic \
+ $(NULL)
+
+
+--- ease-0.4/ease/Makefile.am.dependencies 2010-10-15 21:26:31.000000000 +0200
++++ ease-0.4/ease/Makefile.am 2011-08-13 23:15:51.417665414 +0200
+@@ -47,7 +47,7 @@
+ -I$(top_srcdir)/flutter \
+ -include $(top_srcdir)/config.h
+
+-ease_LDFLAGS = $(EASE_LIBS) --export-dynamic
++ease_LDFLAGS = $(EASE_LIBS) -export-dynamic
+
+ ease_LDADD = \
+ $(top_builddir)/ease-core/libease-core- at EASE_CORE_VERSION@.la \
+--- ease-0.4/ease/Makefile.in.dependencies 2010-10-16 00:40:29.000000000 +0200
++++ ease-0.4/ease/Makefile.in 2011-08-13 23:15:51.418665427 +0200
+@@ -338,7 +338,7 @@
+ -I$(top_srcdir)/flutter \
+ -include $(top_srcdir)/config.h
+
+-ease_LDFLAGS = $(EASE_LIBS) --export-dynamic
++ease_LDFLAGS = $(EASE_LIBS) -export-dynamic
+ ease_LDADD = \
+ $(top_builddir)/ease-core/libease-core- at EASE_CORE_VERSION@.la \
+ $(top_builddir)/flutter/libflutter- at FLUTTER_VERSION@.la \
+--- ease-0.4/configure.dependencies 2010-10-16 00:40:29.000000000 +0200
++++ ease-0.4/configure 2011-08-13 23:17:22.918840675 +0200
+@@ -9095,7 +9095,7 @@
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+- export_dynamic_flag_spec='${wl}--export-dynamic'
++ export_dynamic_flag_spec='${wl}-export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
diff --git a/ease.spec b/ease.spec
index 9bdfb48..4718a7e 100644
--- a/ease.spec
+++ b/ease.spec
@@ -18,8 +18,8 @@ BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libarchive)
BuildRequires: pkgconfig(poppler-glib)
BuildRequires: pkgconfig(gmodule-2.0)
-BuildRequires: pkgconfig(rest-0.7)
-BuildRequires: pkgconfig(rest-extras-0.7)
+BuildRequires: pkgconfig(rest-0.6)
+BuildRequires: pkgconfig(rest-extras-0.6)
BuildRequires: pkgconfig(unique-1.0)
BuildRequires: desktop-file-utils
BuildRequires: intltool
More information about the scm-commits
mailing list