From dcc343c102c400e06c111d7529a6d9bc2b50db8b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 Aug 2011 11:44:31 -0400 Subject: [PATCH 1/3] 1.7.6 --- .gitignore | 1 + cogl.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b0b6fc2..591674f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cogl-1.7.0.tar.bz2 /cogl-1.7.2.tar.bz2 /cogl-1.7.4.tar.xz +/cogl-1.7.6.tar.xz diff --git a/cogl.spec b/cogl.spec index fe8c9d0..c2d5e98 100644 --- a/cogl.spec +++ b/cogl.spec @@ -1,5 +1,5 @@ Name: cogl -Version: 1.7.4 +Version: 1.7.6 Release: 1%{?dist} Summary: A library for using 3D graphics hardware to draw pretty pictures @@ -80,24 +80,24 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %postun -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-,root,root,-) %doc COPYING NEWS README ChangeLog %{_libdir}/libcogl*.so.* %{_libdir}/girepository-1.0/Cogl*.typelib %files devel -%defattr(-, root, root) %{_includedir}/cogl %{_libdir}/libcogl*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gir-1.0/Cogl*.gir %files doc -%defattr(-, root, root) %{_datadir}/gtk-doc/html/cogl %{_datadir}/gtk-doc/html/cogl-2.0-experimental %changelog +* Thu Aug 18 2011 Matthias Clasen - 1.7.6-1 +- Update to 1.7.6 + * Tue Jul 26 2011 Matthias Clasen - 1.7.4-1 - Update to 1.7.4 diff --git a/sources b/sources index 8d4d534..116d891 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4463135cfd3f193f6eddfefa1230c965 cogl-1.7.4.tar.xz +1e46c63c9b820471cdc12a7af87d8458 cogl-1.7.6.tar.xz From b2d3f26c91a3790b38098ba90080f0ed443dc0b6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 Aug 2011 19:29:03 -0400 Subject: [PATCH 2/3] try to fix build --- cogl-deps.patch | 12 ++++++++++++ cogl.spec | 8 ++++++++ 2 files changed, 20 insertions(+) create mode 100644 cogl-deps.patch diff --git a/cogl-deps.patch b/cogl-deps.patch new file mode 100644 index 0000000..bdf510a --- /dev/null +++ b/cogl-deps.patch @@ -0,0 +1,12 @@ +diff -up cogl-1.7.6/configure.ac.cogl-deps cogl-1.7.6/configure.ac +--- cogl-1.7.6/configure.ac.cogl-deps 2011-08-18 19:24:36.401394406 -0400 ++++ cogl-1.7.6/configure.ac 2011-08-18 19:24:54.271427526 -0400 +@@ -866,7 +866,7 @@ AM_PATH_GLIB_2_0([glib_req_version], + [gobject gthread gmodule-no-export]) + AS_IF([test "x$have_glib" = "xno"], AC_MSG_ERROR([glib-2.0 is required])) + +-COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES glib-2.0" ++COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES glib-2.0 gobject-2.0 gmodule-2.0" + AC_SUBST(COGL_PKG_REQUIRES) + PKG_CHECK_MODULES(COGL_DEP, [$COGL_PKG_REQUIRES]) + if test -n "$COGL_PKG_REQUIRES_GL"; then diff --git a/cogl.spec b/cogl.spec index c2d5e98..7fb9e9f 100644 --- a/cogl.spec +++ b/cogl.spec @@ -8,6 +8,9 @@ License: LGPLv2+ URL: http://www.clutter-project.org/ Source0: http://www.clutter-project.org/sources/%{name}/1.7/%{name}-%{version}.tar.xz +# fix missing libraries +Patch0: cogl-deps.patch + BuildRequires: cairo-devel BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel @@ -20,6 +23,8 @@ BuildRequires: mesa-libGL-devel BuildRequires: pango-devel BuildRequires: pkgconfig +BuildRequires: autoconf automake libtool + %description Cogl is a small open source library for using 3D graphics hardware to draw pretty pictures. The API departs from the flat state machine style of @@ -59,6 +64,9 @@ This package contains documentation for %{name}. %prep %setup -q +%patch0 -p1 -b .deps + +autoreconf -i -f %build CFLAGS="$RPM_OPT_FLAGS -fPIC" From 918ea3881a6e8686ac6677b2b727bcc094125492 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 Aug 2011 19:38:43 -0400 Subject: [PATCH 3/3] fix BRs --- cogl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogl.spec b/cogl.spec index 7fb9e9f..0fa982d 100644 --- a/cogl.spec +++ b/cogl.spec @@ -23,7 +23,7 @@ BuildRequires: mesa-libGL-devel BuildRequires: pango-devel BuildRequires: pkgconfig -BuildRequires: autoconf automake libtool +BuildRequires: autoconf automake libtool gettext-devel %description Cogl is a small open source library for using 3D graphics hardware to draw