diff --git a/libwnck.changes b/libwnck.changes index c38fa3f..27ad520 100644 --- a/libwnck.changes +++ b/libwnck.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 21 17:47:43 UTC 2010 - dimstar@opensuse.org + +- Add BuildRequires gobject-introspection-devel. + ------------------------------------------------------------------- Tue Mar 9 08:22:31 CET 2010 - dimstar@opensuse.org diff --git a/libwnck.spec b/libwnck.spec index 0204f79..b1f4079 100644 --- a/libwnck.spec +++ b/libwnck.spec @@ -15,11 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libwnck BuildRequires: fdupes +BuildRequires: gobject-introspection-devel BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: licenses @@ -27,20 +27,21 @@ BuildRequires: licenses %ifarch ppc64 Obsoletes: libwnck-64bit %endif -# -License: LGPLv2.1+ -Group: Development/Libraries/GNOME Version: 2.29.92 Release: 1 +# +License: LGPL v2.1 or later # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: #%(sh %{_sourcedir}/%{name}_spec-update.sh %{_sourcedir} %{name} libwnck-1) %define libwnck-1_name 22 Summary: Window Navigator Construction Kit (Library Package) +Group: Development/Libraries/GNOME Source: %{name}-%{version}.tar.bz2 Source1: %{name}_spec-update.sh Source99: baselibs.conf -Requires: libwnck-1-22 = %{version} licenses Requires: %{name}-lang = %{version} +Requires: libwnck-1-22 = %{version} +Requires: licenses BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,7 +49,7 @@ The Window Navigator Construction Kit is a library that can be used to write task lists, pagers, and similar GNOME programs. %package -n libwnck-1-22 -License: LGPLv2.1+ +License: LGPL v2.1 or later Summary: Window Navigator Construction Kit (Library Package) Group: Development/Libraries/GNOME # Require translation package (%{name}) not older than the library: @@ -64,10 +65,12 @@ The Window Navigator Construction Kit is a library that can be used to write task lists, pagers, and similar GNOME programs. %package devel -License: GPLv2+ +License: GPL v2 or later Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME -Requires: %{name} = %{version} glib2-devel gtk2-devel +Requires: %{name} = %{version} +Requires: glib2-devel +Requires: gtk2-devel # bug437293 %ifarch ppc64 Obsoletes: libwnck-devel-64bit @@ -86,7 +89,7 @@ to develop applications that require these. %build # needed for libwnck-2.19.4: -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure\ --disable-static %__make %{?jobs:-j%jobs} @@ -96,9 +99,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -rm $RPM_BUILD_ROOT/%{_libdir}/*.*a +rm %{buildroot}%{_libdir}/*.*a %find_lang %{name} -LIBNAME="$(echo $RPM_BUILD_ROOT%{_libdir}/%{name}-*.so.?? | sed 's/.*\///;s/\.so\./-/;s/\./_/')" +LIBNAME="$(echo %{buildroot}%{_libdir}/%{name}-*.so.?? | sed 's/.*\///;s/\.so\./-/;s/\./_/')" if test "$LIBNAME" != libwnck-1-22 ; then echo "Library version does not match package name. It should be $LIBNAME." exit 1 @@ -109,10 +112,10 @@ for FILE in COPYING ; do ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE fi done -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -n libwnck-1-22 -p /sbin/ldconfig @@ -129,6 +132,8 @@ rm -rf $RPM_BUILD_ROOT %files -n libwnck-1-22 %defattr(-,root,root) %{_libdir}/*.so.* +%{_libdir}/girepository-1.0/Wnck-1.0.typelib +%{_datadir}/gir-1.0/Wnck-1.0.gir %files devel %defattr(-,root,root) @@ -137,7 +142,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/* +%{_datadir}/gtk-doc/html/ %changelog