- updated to 0.1.5

Changed files:
    garcon.spec -> 1.3

diff --git a/garcon.spec b/garcon.spec
index 278178a95113aaf50fe1696fd1dbebfc03ea0d0a..a89ac65057b18cd28ae91197c1680445c3789876 100644 (file)
--- a/garcon.spec
+++ b/garcon.spec
@@ -4,38 +4,45 @@
 %bcond_without static_libs     # don't build static libraries
 #
 Summary:       Freedesktop.org compliant menu library for the Xfce desktop environment
-Summary(pl.UTF-8):     Biblioteka menu dla środowiska Xfce
+Summary(pl.UTF-8):     Biblioteka menu dla środowiska Xfce zgodna z freedesktop.org
 Name:          garcon
-Version:       0.1.3
-Release:       0.1
+Version:       0.1.5
+Release:       1
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://archive.xfce.org/src/libs/garcon/0.1/%{name}-%{version}.tar.bz2
-# Source0-md5: 3c1d07e9d93d32c1073fcbc9bce80426
+# Source0-md5: c4fd42082b4ae157aa4c7abb6d6570aa
 URL:           http://archive.xfce.org/src/libs/garcon/
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.10.0
+BuildRequires: glib2-devel >= 1:2.14.0
 BuildRequires: gtk-doc >= 1.0
 BuildRequires: intltool
 BuildRequires: pkgconfig
-BuildRequires: xfce4-dev-tools >= 4.6.0
+BuildRequires: xfce4-dev-tools >= 4.8.0
+Obsoletes:     libxfce4menu
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-This is garcon, a freedesktop.org compliant menu implementation based
-on GLib and GIO. It was started as a complete rewrite of the former
-Xfce menu library called libxfce4menu, which, in contrast to garcon,
-was lacking menu merging features essential for loading menus modified
+garcon is a freedesktop.org compliant menu implementation based on
+GLib and GIO. It was started as a complete rewrite of the former Xfce
+menu library called libxfce4menu, which, in contrast to garcon, was
+lacking menu merging features essential for loading menus modified
 with menu editors.
 
-#%description -l pl.UTF-8
+%description -l pl.UTF-8
+garcon jest implementacją menu zgodnego z freedesktop.org, bazującą na
+GLib i GIO. Została rozpoczęta jako całkowite przepisanie biblioteki
+libxfce4menu, której, w odróżnieniu do garcon, brakowało
+funkcjonalności łączenia menu, wymaganej w przypadku modyfikowania za
+pomocą edytora.
 
 %package devel
 Summary:       Header files for garcon library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki garcon
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      gtk+2-devel >= 2:2.10.0
+Requires:      glib2-devel >= 1:2.14.0
+Obsoletes:     libxfce4menu-devel
 
 %description devel
 Header files for garcon library.
@@ -48,6 +55,7 @@ Summary:      Static garcon library
 Summary(pl.UTF-8):     Statyczna biblioteka garcon
 Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
+Obsoletes:     libxfce4menu-static
 
 %description static
 Static garcon library.
@@ -59,6 +67,8 @@ Statyczna biblioteka garcon.
 Summary:       garcon API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki garcon
 Group:         Documentation
+Requires:      gtk-doc-common
+Obsoletes:     libxfce4menu-apidocs
 
 %description apidocs
 API and internal documentation for garcon library.
@@ -73,7 +83,8 @@ Dokumentacja API biblioteki garcon.
 %configure \
        %{!?with_static_libs:--disable-static} \
        --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir}
+       --with-html-dir=%{_gtkdocdir} \
+       --disable-silent-rules
 
 %{__make}
 
@@ -83,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# pt locale is already installed, so there is no need to rename it
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/pt_PT
+
 %find_lang %{name}
 
 %clean