X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexo.git;a=blobdiff_plain;f=exo.spec;h=b275e764b943caeb2f6de108b1b9d82831649ad4;hp=346d65d56e8c692ee215083e4f16cb2a3aa53554;hb=beebe048b77ed8b954f725c6210963aa941670b9;hpb=849ed81e397be9f1eb08d38d0788b9a77b30608c

diff --git a/exo.spec b/exo.spec
index 346d65d..b275e76 100644
--- a/exo.spec
+++ b/exo.spec
@@ -1,37 +1,40 @@
-# TODO:
-# - rename to exo.spec (like tar name)
 #
 # Conditional build:
-%bcond_without	static_libs	# don't build static library
-#
-%define		xfce_version	4.6.0
-#
+%bcond_without	apidocs		# disable gtk-doc
+%bcond_with	static_libs	# don't build static library
+
+%define		xfce_version	4.10.0
 Summary:	Extension library to Xfce developed by os-cillation
 Summary(pl.UTF-8):	Biblioteka rozszerzeń do Xfce opracowana przez os-cillation
-Name:		libexo
-Version:	0.3.100
-Release:	1
+Name:		exo
+Version:	0.10.2
+Release:	3
 License:	GPL v2
 Group:		X11/Libraries
-Source0:	http://www.xfce.org/archive/xfce-%{xfce_version}/src/exo-%{version}.tar.bz2
-# Source0-md5:	ebded97ff55f43cd0fe6b16242992ecf
+Source0:	http://archive.xfce.org/src/xfce/exo/0.10/%{name}-%{version}.tar.bz2
+# Source0-md5:	c70f2a217811bfba2e62f938d4b8f748
+Patch0:		mate-terminal.patch
 URL:		http://www.os-cillation.com/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.10.6
-BuildRequires:	gtk-doc >= 1.7
-BuildRequires:	hal-devel >= 0.5.7
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.27.0
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.9}
+BuildRequires:	gtk-doc-automake
 BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libnotify-devel >= 0.4.0
 BuildRequires:	libtool
+BuildRequires:	libxfce4ui-devel >= %{xfce_version}
 BuildRequires:	libxfce4util-devel >= %{xfce_version}
 BuildRequires:	perl-URI
 BuildRequires:	pkgconfig
-BuildRequires:	python-pygtk-devel >= 2:2.10.3
-BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	xfce4-dev-tools >= 4.6.0
+BuildRequires:	rpmbuild(macros) >= 1.601
+BuildRequires:	xfce4-dev-tools >= 4.10.0
+Requires:	glib2 >= 1:2.27.0
+Requires:	xfce4-dirs >= 4.6
+Provides:	libexo
+Obsoletes:	libexo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,9 +47,9 @@ Biblioteka rozszerzeń do Xfce opracowana przez os-cillation.
 Summary:	The Xfce Preferred Applications framework
 Summary(pl.UTF-8):	Struktura Preferowanych Aplikacji Xfce
 Group:		X11/Applications
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
 Requires:	%{name} = %{version}-%{release}
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
 
 %description -n xfce-preferred-applications
 The Xfce Preferred Applications framework.
@@ -59,6 +62,8 @@ Summary:	libexo API documentation
 Summary(pl.UTF-8):	Dokumentacja API libexo
 Group:		Documentation
 Requires:	gtk-doc-common
+Provides:	libexo-apidocs
+Obsoletes:	libexo-apidocs
 
 %description apidocs
 libexo API documentation.
@@ -71,9 +76,10 @@ Summary:	Header files for libexo library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libexo
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.10.6
-Requires:	hal-devel >= 0.5.7
+Requires:	gtk+2-devel >= 2:2.14.0
 Requires:	libxfce4util-devel >= %{xfce_version}
+Provides:	libexo-devel
+Obsoletes:	libexo-devel
 
 %description devel
 Header files for libexo library.
@@ -86,6 +92,8 @@ Summary:	Static libexo library
 Summary(pl.UTF-8):	Statyczna biblioteka libexo
 Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Provides:	libexo-static
+Obsoletes:	libexo-static
 
 %description static
 Static libexo library.
@@ -93,35 +101,14 @@ Static libexo library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libexo.
 
-%package -n python-exo
-Summary:	Python binding for libexo library
-Summary(pl.UTF-8):	Wiązania Pythona do biblioteki libexo
-Group:		Libraries/Python
-Requires:	%{name} = %{version}-%{release}
-%pyrequires_eq	python-libs
-
-%description -n python-exo
-Python binding for libexo library.
-
-%description -n python-exo -l pl.UTF-8
-Wiązania Pythona do biblioteki libexo.
-
-%package -n python-exo-devel
-Summary:	Development files for libexo Python bindings
-Summary(pl.UTF-8):	Pliki programistyczne wiązań Pythona do libexo
-Group:		Libraries/Python
-Requires:	python-exo = %{version}-%{release}
-
-%description -n python-exo-devel
-Development files for libexo Python bindings.
-
-%description -n python-exo-devel -l pl.UTF-8
-Pliki programistyczne wiązań Pythona do libexo.
-
 %prep
-%setup -q -n exo-%{version}
+%setup -q
+%patch0 -p1
+
+%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
@@ -129,34 +116,32 @@ Pliki programistyczne wiązań Pythona do libexo.
 %{__automake}
 %{__autoconf}
 %configure \
-	--enable-hal \
-	--enable-gtk-doc \
-	--enable-notifications \
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
 	--with-html-dir=%{_gtkdocdir} \
 	%{!?with_static_libs:--disable-static} \
-	--enable-python
+	--disable-silent-rules
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
-mv $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/exo-0.3/*.{la,a}
+# already exists as ur
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ur_PK
 
-%py_postclean
+%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/exo}
 
-%find_lang %{name}-0.3
+%find_lang exo-1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %post	-n xfce-preferred-applications
 %update_icon_cache hicolor
@@ -164,29 +149,20 @@ rm -rf $RPM_BUILD_ROOT
 %postun	-n xfce-preferred-applications
 %update_icon_cache hicolor
 
-%files -f %{name}-0.3.lang
+%files -f exo-1.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog HACKING NEWS README TODO
-%attr(755,root,root) %{_libdir}/libexo-0.3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libexo-0.3.so.0
-%attr(755,root,root) %{_libdir}/libexo-hal-0.3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libexo-hal-0.3.so.0
-%{_pixmapsdir}/exo-0.3
+%attr(755,root,root) %{_libdir}/libexo-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libexo-1.so.0
+%{_pixmapsdir}/exo-1
 
 %files -n xfce-preferred-applications
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/exo-compose-mail-0.3
-%attr(755,root,root) %{_libdir}/exo-helper-0.3
-%attr(755,root,root) %{_libdir}/exo-mount-notify-0.3
+%dir %{_libdir}/xfce4/exo-1
+%attr(755,root,root) %{_libdir}/xfce4/exo-1/exo-compose-mail-1
+%attr(755,root,root) %{_libdir}/xfce4/exo-1/exo-helper-1
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/*.rc
-%{_datadir}/xfce4/doc/C/*
-%lang(es) %{_datadir}/xfce4/doc/es/*
-%lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(id) %{_datadir}/xfce4/doc/id/*
-%lang(ja) %{_datadir}/xfce4/doc/ja/*
-%lang(pt_BR) %{_datadir}/xfce4/doc/pt_BR/*
-%lang(tr) %{_datadir}/xfce4/doc/tr/*
 %dir %{_datadir}/xfce4/helpers
 %{_datadir}/xfce4/helpers/*.desktop
 %{_desktopdir}/*.desktop
@@ -195,35 +171,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/apps/applications-other.png
 %{_mandir}/man1/*.1*
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/exo
+%{_gtkdocdir}/exo-1
+%endif
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libexo-0.3.so
-%attr(755,root,root) %{_libdir}/libexo-hal-0.3.so
-%{_libdir}/libexo-0.3.la
-%{_libdir}/libexo-hal-0.3.la
-%{_includedir}/exo-0.3
-%{_pkgconfigdir}/exo-0.3.pc
-%{_pkgconfigdir}/exo-hal-0.3.pc
+%attr(755,root,root) %{_libdir}/libexo-1.so
+%{_includedir}/exo-1
+%{_pkgconfigdir}/exo-1.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libexo-0.3.a
-%{_libdir}/libexo-hal-0.3.a
+%{_libdir}/libexo-1.a
 %endif
-
-%files -n python-exo
-%defattr(644,root,root,755)
-%dir %{py_sitedir}/exo-0.3
-%attr(755,root,root) %{py_sitedir}/exo-0.3/_exo.so
-%dir %{py_sitedir}/exo-0.3/exo
-%{py_sitedir}/exo-0.3/exo/*.py[co]
-%{py_sitescriptdir}/*.py[co]
-
-%files -n python-exo-devel
-%defattr(644,root,root,755)
-%{_datadir}/pygtk/2.0/defs/exo-0.3