X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexo.git;a=blobdiff_plain;f=exo.spec;h=57113d178dfeca469c08ba4cc711ba359049dc88;hp=8876cc2a1df58504dcae20ebc8a3a6250c6d1464;hb=aa64eb26870c24791ef6dc532a99be58e23c143c;hpb=3edba69583aa081f2b9b452894c5fe2f2850d80e

diff --git a/exo.spec b/exo.spec
index 8876cc2..57113d1 100644
--- a/exo.spec
+++ b/exo.spec
@@ -1,23 +1,36 @@
+#
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
 #
+%define		_pre		rc2
+%define		xfce_version	4.3.99.2
+#
 Summary:	Extension library to Xfce developed by os-cillation
 Summary(pl):	Biblioteka rozszerzeñ do Xfce opracowana przez os-cillation
 Name:		libexo
-Version:	0.3.0
-Release:	1
+Version:	0.3.1.12
+Release:	0.%{_pre}.1
 License:	GPL v2
 Group:		Libraries
-Source0:	http://download.berlios.de/xfce-goodies/exo-%{version}.tar.bz2
-# Source0-md5:	ffcd73ec6b34f19c81afdc3f1a97377b
+Source0:	http://www.xfce.org/archive/xfce-%{xfce_version}/src/exo-%{version}%{_pre}.tar.bz2
+# Source0-md5:	4c74431033c4c222efeccd4cf47ab65f
 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.0
-BuildRequires:	gtk+2-devel >= 2:2.4.0
-BuildRequires:	libxfcegui4-devel >= 4.2.0
+BuildRequires:	intltool >= 0.35.0
+BuildRequires:	libtool
+BuildRequires:	libxfce4util-devel >= %{xfce_version}
+BuildRequires:	perl-URI
 BuildRequires:	pkgconfig
-BuildRequires:	python
-BuildRequires:	python-pygtk-devel >= 2:2.4.0
+BuildRequires:	python-pygtk-devel >= 2:2.10.3
+BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpm-pythonprov
+BuildRequires:	xfce4-dev-tools >= %{xfce_version}
+BuildRequires:	xfce-mcs-manager-devel >= %{xfce_version}
+BuildRequires:	xorg-lib-libXt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -26,12 +39,26 @@ Extension library to Xfce developed by os-cillation.
 %description -l pl
 Biblioteka rozszerzeñ do Xfce opracowana przez os-cillation.
 
+%package -n xfce-preferred-applications
+Summary:	The Xfce Preferred Applications framework
+Summary(pl):	Struktura Preferowanych Aplikacji Xfce
+Group:		Applications
+Requires(post,postun):	gtk+2 >= 2:2.10.6
+Requires(post,postun):	hicolor-icon-theme
+Requires:	xfce-mcs-plugins >= %{xfce_version}
+
+%description -n xfce-preferred-applications
+The Xfce Preferred Applications framework.
+
+%description -n xfce-preferred-applications -l pl
+Struktura Preferowanych Aplikacji Xfce.
+
 %package devel
 Summary:	Header files for libexo library
 Summary(pl):	Pliki nag³ówkowe biblioteki libexo
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	libxfcegui4-devel >= 4.2.0
+Requires:	libxfce4util-devel >= %{xfce_version}
 
 %description devel
 Header files for libexo library.
@@ -77,12 +104,20 @@ Development files for libexo Python bindings.
 Pliki programistyczne wi±zañ Pythona do libexo.
 
 %prep
-%setup -q -n exo-%{version}
+%setup -q -n exo-%{version}%{_pre}
 
 %build
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
-	%{!?with_static_libs:--disable-static}
+	%{!?with_static_libs:--disable-static} \
+	--enable-python \
+	--enable-xfce-mcs-manager
 %{__make}
 
 %install
@@ -91,8 +126,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{py_sitedir}/exo-0.3/*.{la,a}
 
+%py_postclean
+
 %find_lang %{name}-0.3
 
 %clean
@@ -101,10 +139,35 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	-n xfce-preferred-applications
+%update_icon_cache hicolor
+
+%postun	-n xfce-preferred-applications
+%update_icon_cache hicolor
+
 %files -f %{name}-0.3.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog HACKING NEWS README TODO
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%{_pixmapsdir}/exo-0.3/
+
+%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}/xfce4/mcs-plugins/exo-preferred-applications-settings.so
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/xfce4/*.rc
+%{_datadir}/xfce4/doc/C
+%lang(fr) %{_datadir}/xfce4/doc/fr
+%lang(ja) %{_datadir}/xfce4/doc/ja
+%dir %{_datadir}/xfce4/helpers
+%{_datadir}/xfce4/helpers/*.desktop
+%{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/preferences-desktop-default-applications.png
+%{_iconsdir}/hicolor/*/apps/applications-internet.png
+%{_iconsdir}/hicolor/*/apps/applications-other.png
+%{_mandir}/man1/*.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -112,7 +175,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.la
 %{_includedir}/exo-0.3
 %{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/exo
+# not present in beta ?
+#%{_gtkdocdir}/exo
 
 %if %{with static_libs}
 %files static