X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=glade.spec;h=28e9ae04f2dd74b236372ebc133301bf4e968683;hb=35c62761d50d1146304d1d48d50e9424a40e9742;hp=692bbba5c8c39c7f3cb244164b2f6094096272bf;hpb=4ef6843334d245b75909d62181efb0eddfeb9b4b;p=packages%2Fglade.git

diff --git a/glade.spec b/glade.spec
index 692bbba..28e9ae0 100644
--- a/glade.spec
+++ b/glade.spec
@@ -2,35 +2,40 @@
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
 %bcond_without	static_libs	# don't build static libraries
-#
+
 Summary:	User interface builder for GTK+ and GNOME
 Summary(pl.UTF-8):	Budowniczy interfejsów użytkownika dla GTK+ i GNOME
 Name:		glade
-Version:	3.10.0
-Release:	1
-License:	GPL v2 and LGPL v2
+Version:	3.18.1
+Release:	2
+License:	GPL v2+ and LGPL v2.1+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade/3.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	70c61582bdc6e9a852b29f3d172ddd4e
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade/3.18/%{name}-%{version}.tar.xz
+# Source0-md5:	3c61ab3df62de850f1ff676ef34c6ed1
 URL:		http://glade.gnome.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1:1.11
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	gnome-common
-BuildRequires:	gnome-doc-utils >= 0.18.0
-BuildRequires:	gobject-introspection-devel >= 0.10.1
-BuildRequires:	gtk+3-devel >= 3.0.2
+BuildRequires:	gobject-introspection-devel >= 1.32.0
+BuildRequires:	gtk+3-devel >= 3.12.0
 BuildRequires:	gtk-doc >= 1.13
 BuildRequires:	intltool >= 0.41.0
 BuildRequires:	libtool >= 2:2.2.6
-BuildRequires:	libxml2-devel >= 1:2.4.0
+BuildRequires:	libxml2-devel >= 2.4.0
+BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
-BuildRequires:	python-pygobject-devel >= 2.28.0
+BuildRequires:	python-pygobject3-devel >= 3.8.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+BuildRequires:	yelp-tools
 Requires(post,postun):	gtk-update-icon-cache
+Requires(post,postun):	desktop-file-utils
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	hicolor-icon-theme
+Conflicts:	glade3 < 3.8.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -62,7 +67,8 @@ i inne.
 Summary:	Glade library
 Summary(pl.UTF-8):	Biblioteka Glade
 Group:		X11/Libraries
-Requires:	gtk+3 >= 3.0.2
+Requires:	gtk+3 >= 3.12.0
+Requires:	libxml2 >= 2.4.0
 
 %description libs
 Glade library.
@@ -75,8 +81,8 @@ Summary:	Header files for Glade library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Glade
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gtk+3-devel >= 3.0.2
-Requires:	libxml2-devel >= 1:2.4.0
+Requires:	gtk+3-devel >= 3.12.0
+Requires:	libxml2-devel >= 2.4.0
 
 %description devel
 Header files for Glade library.
@@ -101,6 +107,9 @@ Summary:	Glade API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki Glade
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Glade API documentation.
@@ -131,27 +140,30 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.{a,la}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%find_lang %{name} --with-gnome --with-omf
+%find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_icon_cache hicolor
+%update_desktop_database_post
 
 %postun
 %update_icon_cache hicolor
+%update_desktop_database_postun
 
-%post libs -p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+# NOTE: COPYING contains general notes; full GPL and LGPL texts are in COPYING.{GPL,LGPL}
+%doc AUTHORS COPYING ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/glade
 %attr(755,root,root) %{_bindir}/glade-previewer
 %dir %{_libdir}/glade
@@ -160,12 +172,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/glade/modules/libgladepython.so
 %{_datadir}/glade
 %{_desktopdir}/glade.desktop
-%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*/apps/glade.png
+%{_datadir}/appdata/glade.appdata.xml
+%{_mandir}/man1/glade-previewer.1*
+%{_mandir}/man1/glade.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgladeui-2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgladeui-2.so.0
+%attr(755,root,root) %ghost %{_libdir}/libgladeui-2.so.6
 %{_libdir}/girepository-1.0/Gladeui-2.0.typelib
 
 %files devel
@@ -184,5 +199,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gladeui
+%{_gtkdocdir}/gladeui-2
 %endif