- up to 3.0.0; merged from DEVEL

- update BR

Changed files:
    libgweather.spec -> 1.34

diff --git a/libgweather.spec b/libgweather.spec
index 4914fcdb7674f1ec21140f65ac8cfa6d507b1f5a..d16e0941004a6e6357fa495587fbd29a14e1bf07 100644 (file)
--- a/libgweather.spec
+++ b/libgweather.spec
@@ -1,19 +1,21 @@
 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:       4
+Version:       3.0.0
+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.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 51fc5dd9bbfc321d1d03c613f1d97f35
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.26.0
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.9
 BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gnome-common >= 2.20.0
-BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: gobject-introspection-devel >= 0.9.5
+BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.9
 BuildRequires: intltool >= 0.40.3
 BuildRequires: libsoup-gnome-devel >= 2.26.0
@@ -41,7 +43,7 @@ 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:      gtk+3-devel >= 3.0.0
 Requires:      libsoup-devel >= 2.26.0
 Requires:      libxml2-devel >= 1:2.6.30
 Obsoletes:     gnome-applets-devel <= 2.21.4
@@ -78,8 +80,6 @@ Dokumentacja API biblioteki libgweather.
 
 %prep
 %setup -q
-sed -i s#^en@shaw## po/LINGUAS
-rm po/en@shaw.po
 
 %build
 %{__gtkdocize}
@@ -94,6 +94,7 @@ rm po/en@shaw.po
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir} \
        --disable-silent-rules
+
 %{__make} -j1 -C data
 %{__make}
 
@@ -103,12 +104,13 @@ 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%{_datadir}/locale/es_ES
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%find_lang libgweather
+%find_lang libgweather-3.0
 
 find $RPM_BUILD_ROOT -name "Locations.*.xml" | sed 's:'"$RPM_BUILD_ROOT"'::
-s:\(.*\)/Locations\.\([^.]*\)\.xml:%lang(\2) \1/Locations.\2.xml:' >> libgweather.lang
+s:\(.*\)/Locations\.\([^.]*\)\.xml:%lang(\2) \1/Locations.\2.xml:' >> libgweather-3.0.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,11 +127,11 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 %update_icon_cache gnome
 
-%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
+%attr(755,root,root) %{_libdir}/libgweather-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgweather-3.so.0
 %{_sysconfdir}/gconf/schemas/gweather.schemas
 %dir %{_datadir}/libgweather
 %{_datadir}/libgweather/Locations.xml
@@ -137,18 +139,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_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