diff --git a/.gitignore b/.gitignore index f43409c..216de2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libmatekbd-1.4.0.tar.xz /libmatekbd-1.5.0.tar.xz +/libmatekbd-1.5.1.tar.xz diff --git a/libmatekbd.spec b/libmatekbd.spec index 321b9de..695c455 100644 --- a/libmatekbd.spec +++ b/libmatekbd.spec @@ -1,19 +1,17 @@ Name: libmatekbd -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: Libraries for mate kbd License: LGPLv2+ URL: http://mate-desktop.org Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz BuildRequires: desktop-file-utils -BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(libxklavier) +BuildRequires: gsettings-desktop-schemas-devel +BuildRequires: gtk2-devel +BuildRequires: libxklavier-devel BuildRequires: mate-common -BuildRequires: pkgconfig(gsettings-desktop-schemas) - -Requires: gsettings-desktop-schemas - +BuildRequires: mate-doc-utils %description Libraries for matekbd @@ -31,7 +29,14 @@ NOCONFIGURE=1 ./autogen.sh %build -%configure --disable-static +%configure \ + --disable-static \ + --with-gtk=2.0 \ + --disable-schemas-compile \ + --with-x \ + --with-gnu-ld \ + + make %{?_smp_mflags} V=1 @@ -42,10 +47,10 @@ find %{buildroot} -name '*.la' -exec rm -fv {} ';' #desktop-file-install \ -# --remove-category="MATE" \ -# --add-category="X-Mate" \ -# --delete-original \ -# --dir=%{buildroot}%{_datadir}/applications \ +# --remove-category="MATE" \ +# --add-category="X-Mate" \ +# --delete-original \ +# --dir=%{buildroot}%{_datadir}/applications \ #%{buildroot}%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop @@ -67,20 +72,27 @@ fi /sbin/ldconfig %files -f %{name}.lang -%doc AUTHORS COPYING.LIB README -%{_datadir}/libmatekbd/ +%doc AUTHORS COPYING README +%{_datadir}/libmatekbd %{_datadir}/glib-2.0/schemas/org.mate.peripherals-keyboard-xkb.gschema.xml %{_libdir}/libmatekbd.so.4* %{_libdir}/libmatekbdui.so.4* +%{_datadir}/MateConf/gsettings/matekbd.convert %files devel -%{_includedir}/libmatekbd/ +%{_includedir}/libmatekbd %{_libdir}/pkgconfig/libmatekbd.pc %{_libdir}/pkgconfig/libmatekbdui.pc %{_libdir}/libmatekbdui.so %{_libdir}/libmatekbd.so %changelog +* Fri Feb 08 2013 Dan Mashal - 1.5.1-1 +-Update to latest upstream release +-Update BR's +-Own dirs we are supposed to own +-Update configure flags + * Mon Dec 10 2012 Dan Mashal - 1.5.0-2 - Rebuild for ARM diff --git a/sources b/sources index 949c538..7068b12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa3781beb79ceb8126df589cea481140 libmatekbd-1.5.0.tar.xz +5899888e87dd0c45fba81ec55091f37d libmatekbd-1.5.1.tar.xz