From b8fadf1f01aa8875009b830bf7f5f2f5c1596592 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Aug 30 2006 17:31:45 +0000 Subject: 3.0 --- diff --git a/.cvsignore b/.cvsignore index 9535658..a4c1615 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libxklavier-2.91.tar.gz +libxklavier-3.0.tar.gz diff --git a/libxklavier.spec b/libxklavier.spec index 2d3b26c..d7d428c 100644 --- a/libxklavier.spec +++ b/libxklavier.spec @@ -1,7 +1,7 @@ Summary: library providing high-level API for X Keyboard Extension Name: libxklavier -Version: 2.91 -Release: 1.1 +Version: 3.0 +Release: 1%{?dist} License: LGPL Group: Development/Libraries Url: http://gswitchit.sourceforge.net/ @@ -14,9 +14,6 @@ BuildRequires: glib2-devel >= 2.6.0 Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -#Patch0: libxklavier-1.14-werror.patch -#Patch1: libxklavier-2.1.0.2006.02.23-trap-x-error.patch - %description libxklavier is a library providing high-level API for X Keyboard Extension known as XKB. This library is intended to support XFree86 and other @@ -27,14 +24,13 @@ commercial X servers. It is useful for creating XKB-related software Summary: Libraries, includes, etc to develop libxklavier applications Group: Development/Libraries Requires: %{name} = %{version} +Requires: pkgconfig %description devel Libraries, include files, etc you can use to develop libxklavier applications. %prep %setup -q -#%patch0 -p1 -b .werror -#%patch1 -p1 -b .trap-x-error %build @@ -46,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %clean rm -rf %{buildroot} @@ -66,12 +62,16 @@ rm -rf %{buildroot} %defattr(-, root, root) %{_libdir}/pkgconfig/*.pc -%{_libdir}/*.a %{_libdir}/*.so %{_includedir}/* %{_datadir}/gtk-doc/html/libxklavier/ %changelog +* Wed Aug 30 2006 Matthias Clasen - 3.0-1.fc6 +- Update to 3.0 +- Require pkgconfig in the -devel package +- Don't ship static libraries + * Wed Jul 12 2006 Jesse Keating - 2.91-1.1 - rebuild diff --git a/sources b/sources index 478284f..8a0c57f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d9864d165c86edb6a67f7ebe140814 libxklavier-2.91.tar.gz +7457dc72cfcb57498882ea652cb79eeb libxklavier-3.0.tar.gz