commit 6e43e29da98a0fe6d6ff041bf94ee55b1c5ece1c
Author: Marcin Banasiak <[email protected]>
Date: Sun Jun 16 18:24:43 2013 +0200
Rename vala-zeitgeist to vala-zeitgeist1 to avoid name conflict with
package provided by zeitgeist.spec. Release 3
libzeitgeist-am.patch | 19 +++++++++++++++++++
libzeitgeist.spec | 13 ++++++++-----
2 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/libzeitgeist.spec b/libzeitgeist.spec
index c43f743..e7b95b0 100644
--- a/libzeitgeist.spec
+++ b/libzeitgeist.spec
@@ -7,11 +7,12 @@ Summary: Zeitgeist client library
Summary(pl.UTF-8): Biblioteka kliencka Zeitgeist
Name: libzeitgeist
Version: 0.3.18
-Release: 2
+Release: 3
License: LGPL v2+
Group: Libraries
Source0:
http://launchpad.net/libzeitgeist/0.3/%{version}/+download/%{name}-%{version}.tar.gz
# Source0-md5: d63a37295d01a58086d0d4ae26e604c2
+Patch0: %{name}-am.patch
URL: http://zeitgeist-project.com/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -67,21 +68,23 @@ API documentation for zeitgeist library.
%description apidocs -l pl.UTF-8
Dokumentacja API biblioteki zeitgeist.
-%package -n vala-zeitgeist
+%package -n vala-zeitgeist1
Summary: Vala API for zeitgeist library
Summary(pl.UTF-8): API języka Vala dla biblioteki zeitgeist
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: vala
+Conflicts: vala-zeitgeist < 0.3.18-3
-%description -n vala-zeitgeist
+%description -n vala-zeitgeist1
Vala API for zeitgeist library.
-%description -n vala-zeitgeist -l pl.UTF-8
+%description -n vala-zeitgeist1 -l pl.UTF-8
API języka Vala dla biblioteki zeitgeist.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
@@ -135,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT
%{_gtkdocdir}/zeitgeist-1.0
%endif
-%files -n vala-zeitgeist
+%files -n vala-zeitgeist1
%defattr(644,root,root,755)
%{_datadir}/vala/vapi/zeitgeist-1.0.deps
%{_datadir}/vala/vapi/zeitgeist-1.0.vapi
diff --git a/libzeitgeist-am.patch b/libzeitgeist-am.patch
new file mode 100644
index 0000000..edd3bfc
--- /dev/null
+++ b/libzeitgeist-am.patch
@@ -0,0 +1,19 @@
+--- libzeitgeist-0.3.18/configure.ac.orig 2013-06-13 22:25:25.945934397
+0200
++++ libzeitgeist-0.3.18/configure.ac 2013-06-13 22:27:33.495243403 +0200
+@@ -2,7 +2,7 @@
+ AC_INIT(libzeitgeist, 0.3.18)
+
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+@@ -30,7 +30,6 @@ AC_SUBST(ZEITGEIST_LT_LDFLAGS)
+ ###################################################################
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libzeitgeist.git/commitdiff/6e43e29da98a0fe6d6ff041bf94ee55b1c5ece1c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
