[ease/f14] Actualize BuildRequires
Michel Alexandre Salim
salimma at fedoraproject.org
Sat Aug 13 20:56:11 UTC 2011
commit 37e4768a36bf59a56bd2174991dd6a30f8297610
Author: Marek Kasik <mkasik at redhat.com>
Date: Mon Feb 21 11:58:32 2011 +0100
Actualize BuildRequires
Use -export-dynamic instead of --export-dynamic
ease-0.4-dependencies.patch | 153 +++++++++++++++++++++++++++++++++++++++++++
ease.spec | 12 +++-
2 files changed, 162 insertions(+), 3 deletions(-)
---
diff --git a/ease-0.4-dependencies.patch b/ease-0.4-dependencies.patch
new file mode 100644
index 0000000..e48bf2c
--- /dev/null
+++ b/ease-0.4-dependencies.patch
@@ -0,0 +1,153 @@
+--- 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
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${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
+ _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;
+ _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'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-export-dynamic'
+
+ # 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;
+ 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'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-export-dynamic'
+
+ # 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;
+ esac
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-export-dynamic'
+ _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;
+ esac
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-export-dynamic'
+ _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;
+ xl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-export-dynamic'
+ _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~
diff --git a/ease.spec b/ease.spec
index 4e64fb1..6173333 100644
--- a/ease.spec
+++ b/ease.spec
@@ -1,7 +1,7 @@
%global vapi_ver 0.10
Name: ease
Version: 0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GNOME desktop presentation application
Group: Applications/Productivity
@@ -10,6 +10,7 @@ URL: http://www.ease-project.org/
Source0: http://ftp.gnome.org/pub/GNOME/sources/ease/0.4/ease-%{version}.tar.bz2
# desktop file's MimeType must have a ; trailing character
Patch0: ease-0.4-fix_mime-type.patch
+Patch1: ease-0.4-dependencies.patch
BuildRequires: pkgconfig(clutter-gst-1.0)
BuildRequires: pkgconfig(clutter-gtk-0.10)
@@ -18,8 +19,8 @@ BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libarchive)
BuildRequires: pkgconfig(poppler-glib)
BuildRequires: pkgconfig(gmodule-2.0)
-BuildRequires: pkgconfig(rest-0.6)
-BuildRequires: pkgconfig(rest-extras-0.6)
+BuildRequires: pkgconfig(rest-0.7)
+BuildRequires: pkgconfig(rest-extras-0.7)
BuildRequires: pkgconfig(unique-1.0)
BuildRequires: desktop-file-utils
BuildRequires: intltool
@@ -45,6 +46,7 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .fix_mime-type
+%patch1 -p1 -b .dependencies
%build
@@ -114,5 +116,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Feb 21 2011 Marek Kasik <mkasik at redhat.com> - 0.4-2
+- Actualize BuildRequires
+- Use -export-dynamic instead of --export-dynamic
+
* Tue Nov 16 2010 Michel Salim <salimma at fedoraproject.org> - 0.4-1
- Initial package
More information about the scm-commits
mailing list