X-Git-Url: http://git.pld-linux.org/?p=packages%2Flibgweather.git;a=blobdiff_plain;f=libgweather.spec;h=77bb97d67d991c06fb9c69a6b027db7390606948;hp=75d03c64a4450489539a4d0012b091a5cf9f73c4;hb=d437c0b;hpb=ba6329ad5d5c38187a30580f68bcf09db8f2c58a

diff --git a/libgweather.spec b/libgweather.spec
index 75d03c6..77bb97d 100644
--- a/libgweather.spec
+++ b/libgweather.spec
@@ -1,28 +1,43 @@
+#
+# Conditional build:
+%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:	2.30.3
-Release:	2
+Version:	3.20.1
+Release:	1
 License:	GPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgweather/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5:	bf6a0a05051341ecb250f332e3edfb88
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgweather/3.20/%{name}-%{version}.tar.xz
+# Source0-md5:	1a5562f956cb5eb86dad4eb9be7c90f3
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.26.0
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9
-BuildRequires:	gettext-devel
+BuildRequires:	autoconf >= 2.64
+BuildRequires:	automake >= 1:1.11
+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:	gtk+2-devel >= 2:2.16.0
-BuildRequires:	gtk-doc >= 1.9
-BuildRequires:	intltool >= 0.40.3
-BuildRequires:	libsoup-gnome-devel >= 2.26.0
-BuildRequires:	libtool
+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.44.0
+BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	libxml2-devel >= 1:2.6.30
 BuildRequires:	pkgconfig >= 1:0.19
-Requires(post,postun):	gnome-icon-theme
-Requires(post,postun):	gtk+2
-Requires(post,preun):	GConf2
+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.44.0
+Requires:	libxml2 >= 1:2.6.30
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,9 +55,8 @@ Summary:	Header files for libgweather
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libgweather
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	GConf2-devel >= 2.26.0
-Requires:	gtk+2-devel >= 2:2.16.0
-Requires:	libsoup-devel >= 2.26.0
+Requires:	gtk+3-devel >= 3.14.0
+Requires:	libsoup-devel >= 2.44.0
 Requires:	libxml2-devel >= 1:2.6.30
 Obsoletes:	gnome-applets-devel <= 2.21.4
 
@@ -69,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.
@@ -76,10 +93,37 @@ 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.
+
+%description -n vala-libgweather -l pl.UTF-8
+API biblioteki libgweather dla języka Vala.
+
 %prep
 %setup -q
-sed -i s#^en@shaw## po/LINGUAS
-rm po/en@shaw.po
 
 %build
 %{__gtkdocize}
@@ -90,10 +134,14 @@ rm po/en@shaw.po
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-zoneinfo-dir=%{_datadir}/zoneinfo \
+	%{!?with_glade:--disable-glade-catalog} \
 	--enable-gtk-doc \
+	--disable-silent-rules \
+	--enable-static \
+	%{__enable_disable vala} \
 	--with-html-dir=%{_gtkdocdir} \
-	--disable-silent-rules
+	--with-zoneinfo-dir=%{_datadir}/zoneinfo
+
 %{__make} -j1 -C data
 %{__make}
 
@@ -103,52 +151,57 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/es_ES
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/es_ES
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%find_lang libgweather
-
-find $RPM_BUILD_ROOT -name "Locations.*.xml" | sed 's:'"$RPM_BUILD_ROOT"'::
-s:\(.*\)/Locations\.\([^.]*\)\.xml:%lang(\2) \1/Locations.\2.xml:' >> libgweather.lang
+%find_lang libgweather-3.0 --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-%update_icon_cache gnome
-%gconf_schema_install gweather.schemas
-
-%preun
-%gconf_schema_uninstall gweather.schemas
+%glib_compile_schemas
 
 %postun
 /sbin/ldconfig
-%update_icon_cache gnome
+%glib_compile_schemas
 
-%files -f libgweather.lang
+%files -f libgweather-3.0.lang
 %defattr(644,root,root,755)
-%doc ChangeLog README
-%attr(755,root,root) %{_libdir}/libgweather.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgweather.so.1
-%{_sysconfdir}/gconf/schemas/gweather.schemas
+%doc AUTHORS HACKING NEWS README
+%attr(755,root,root) %{_libdir}/libgweather-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgweather-3.so.6
+%{_datadir}/glib-2.0/schemas/org.gnome.GWeather.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.GWeather.gschema.xml
 %dir %{_datadir}/libgweather
 %{_datadir}/libgweather/Locations.xml
 %{_datadir}/libgweather/locations.dtd
-%{_iconsdir}/gnome/*/status/*.png
-# XXX: gnome-icon-theme doesn't provide this directory
-%{_iconsdir}/gnome/scalable
+%{_libdir}/girepository-1.0/GWeather-3.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgweather.so
-%{_libdir}/libgweather.la
-%{_includedir}/libgweather
-%{_pkgconfigdir}/gweather.pc
+%attr(755,root,root) %{_libdir}/libgweather-3.so
+%{_includedir}/libgweather-3.0
+%{_pkgconfigdir}/gweather-3.0.pc
+%{_datadir}/gir-1.0/GWeather-3.0.gir
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgweather.a
+%{_libdir}/libgweather-3.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/libgweather
+%{_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)
+%{_datadir}/vala/vapi/gweather-3.0.vapi
+%endif