- updated to 3.20.1

[packages/libgweather.git] / libgweather.spec

diff --git a/libgweather.spec b/libgweather.spec
index b3a5cc33eded371bb3f2f90deea937f402f533de..77bb97d67d991c06fb9c69a6b027db7390606948 100644 (file)
--- a/libgweather.spec
+++ b/libgweather.spec
@@ -1,38 +1,42 @@
 #
 # Conditional build:
-%bcond_without vala            # do not build Vala API
-#
+%bcond_without glade   # Glade catalog
+%bcond_without vala    # do not build Vala API
+
 Summary:       Library to access weather information from online services for numerous locations
 Summary(pl.UTF-8):     Biblioteka dostępu do informacji pogodowych z serwisów internetowych dla różnych miejsc
 Name:          libgweather
-Version:       3.14.0
+Version:       3.20.1
 Release:       1
 License:       GPL v2+
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgweather/3.14/%{name}-%{version}.tar.xz
-# Source0-md5: abef7cd6053699389273324921f2be67
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgweather/3.20/%{name}-%{version}.tar.xz
+# Source0-md5: 1a5562f956cb5eb86dad4eb9be7c90f3
 URL:           http://www.gnome.org/
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11
-BuildRequires: gettext-devel >= 0.18
 BuildRequires: geocode-glib-devel
+BuildRequires: gettext-tools >= 0.18
+%{?with_glade:BuildRequires:   glade-devel >= 2.0}
 BuildRequires: glib2-devel >= 1:2.35.1
 BuildRequires: gnome-common >= 2.20.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gtk+3-devel >= 3.14.0
 BuildRequires: gtk-doc >= 1.11
 BuildRequires: intltool >= 0.50.0
-BuildRequires: libsoup-devel >= 2.34.0
+BuildRequires: libsoup-devel >= 2.44.0
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: libxml2-devel >= 1:2.6.30
 BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: rpmbuild(macros) >= 1.592
 BuildRequires: tar >= 1:1.22
 %{?with_vala:BuildRequires:    vala >= 2:0.18.0}
 BuildRequires: xz
+Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): glib2 >= 1:2.35.1
 Requires:      glib2 >= 1:2.35.1
 Requires:      gtk+3 >= 3.14.0
-Requires:      libsoup >= 2.34.0
+Requires:      libsoup >= 2.44.0
 Requires:      libxml2 >= 1:2.6.30
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
@@ -52,7 +56,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki libgweather
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      gtk+3-devel >= 3.14.0
-Requires:      libsoup-devel >= 2.34.0
+Requires:      libsoup-devel >= 2.44.0
 Requires:      libxml2-devel >= 1:2.6.30
 Obsoletes:     gnome-applets-devel <= 2.21.4
 
@@ -79,6 +83,9 @@ Summary:      libgweather API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libgweather
 Group:         Documentation
 Requires:      gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 libgweather API documentation.
@@ -86,12 +93,28 @@ libgweather API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki libgweather.
 
+%package glade
+Summary:       libgweather catalog file for Glade
+Summary(pl.UTF-8):     Plik katalogu libgweather dla Glade
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      glade >= 2.0
+
+%description glade
+libgweather catalog file for Glade.
+
+%description glade -l pl.UTF-8
+Plik katalogu libgweather dla Glade.
+
 %package -n vala-libgweather
 Summary:       libgweather API for Vala language
 Summary(pl.UTF-8):     API biblioteki libgweather dla języka Vala
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      vala >= 2:0.18.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description -n vala-libgweather
 libgweather API for Vala language.
@@ -111,12 +134,13 @@ API biblioteki libgweather dla języka Vala.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{__enable_disable vala vala} \
-       --with-zoneinfo-dir=%{_datadir}/zoneinfo \
+       %{!?with_glade:--disable-glade-catalog} \
        --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir} \
        --disable-silent-rules \
-       --enable-static
+       --enable-static \
+       %{__enable_disable vala} \
+       --with-html-dir=%{_gtkdocdir} \
+       --with-zoneinfo-dir=%{_datadir}/zoneinfo
 
 %{__make} -j1 -C data
 %{__make}
@@ -170,6 +194,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libgweather-3.0
 
+%if %{with glade}
+%files glade
+%defattr(644,root,root,755)
+%{_datadir}/glade/catalogs/libgweather.xml
+%endif
+
 %if %{with vala}
 %files -n vala-libgweather
 %defattr(644,root,root,755)