Author: caleb Date: Tue Jun 21 17:19:49 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- Added patch for compiling against new clutter-{gst,gtk}. NFY
- BR: gtk+2-devel
---- Files affected:
packages/lyricue:
lyricue.spec (1.37 -> 1.38) , lyricue-clutter.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/lyricue/lyricue.spec
diff -u packages/lyricue/lyricue.spec:1.37 packages/lyricue/lyricue.spec:1.38
--- packages/lyricue/lyricue.spec:1.37 Fri Jan 28 03:19:45 2011
+++ packages/lyricue/lyricue.spec Tue Jun 21 19:19:43 2011
@@ -9,6 +9,7 @@
Source0: http://www.lyricue.org/archive/%{name}_%{version}.tar.gz
# Source0-md5: d7184f8243a9e4e8e4d3a699e6ceadce
URL: http://www.lyricue.org
+Patch0: %{name}-clutter.patch
BuildRequires: clutter-gst-devel >= 0.10
BuildRequires: clutter-gtk-devel >= 0.10
BuildRequires: gettext-devel
@@ -17,6 +18,7 @@
BuildRequires: pkgconfig
BuildRequires: rpm-perlprov
BuildRequires: sed >= 4.0
+BuildRequires: gtk+2-devel
Requires: %{name}-display = %{version}-%{release}
Requires: %{name}-remote = %{version}-%{release}
Requires: clutter-gst >= 0.10
@@ -61,6 +63,7 @@
%prep
%setup -q
+%patch0 -p1
# Fix perl shebang
%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' src/%{name} src/%{name}_remote
@@ -106,6 +109,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2011/06/21 17:19:43 caleb
+- Added patch for compiling against new clutter-{gst,gtk}. NFY
+- BR: gtk+2-devel
+
Revision 1.37 2011/01/28 02:19:45 sparky
- BR: intltool, mysql-devel, pkgconfig
================================================================
Index: packages/lyricue/lyricue-clutter.patch
diff -u /dev/null packages/lyricue/lyricue-clutter.patch:1.1
--- /dev/null Tue Jun 21 19:19:49 2011
+++ packages/lyricue/lyricue-clutter.patch Tue Jun 21 19:19:43 2011
@@ -0,0 +1,52 @@
+--- lyricue-3.0.25/configure~ 2010-10-10 02:23:43.000000000 +0300
++++ lyricue-3.0.25/configure 2011-06-21 18:39:15.000000000 +0300
+@@ -13331,12 +13331,12 @@
+ pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gst-0.10
clutter-gtk-0.10") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gst-1.0
clutter-gtk-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 clutter-gst-0.10
clutter-gtk-0.10" 2>/dev/null`
++ pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 clutter-gst-1.0
clutter-gtk-1.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -13347,12 +13347,12 @@
+ pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gst-0.10
clutter-gtk-0.10") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "clutter-1.0 clutter-gst-1.0
clutter-gtk-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 clutter-gst-0.10
clutter-gtk-0.10" 2>/dev/null`
++ pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 clutter-gst-1.0
clutter-gtk-1.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -13372,14 +13372,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"clutter-1.0 clutter-gst-0.10 clutter-gtk-0.10" 2>&1`
++ CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"clutter-1.0 clutter-gst-1.0 clutter-gtk-1.0" 2>&1`
+ else
+- CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-1.0
clutter-gst-0.10 clutter-gtk-0.10" 2>&1`
++ CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-1.0
clutter-gst-1.0 clutter-gtk-1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CLUTTER_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (clutter-1.0 clutter-gst-0.10
clutter-gtk-0.10) were not met:
++ as_fn_error $? "Package requirements (clutter-1.0 clutter-gst-1.0
clutter-gtk-1.0) were not met:
+
+ $CLUTTER_PKG_ERRORS
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyricue/lyricue.spec?r1=1.37&r2=1.38&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
