SPECS: libexo.spec - merged from DEVEL

[freetz]

Author: freetz                       Date: Sun Jul 16 16:47:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   libexo.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/libexo.spec
diff -u SPECS/libexo.spec:1.15 SPECS/libexo.spec:1.16
--- SPECS/libexo.spec:1.15	Sat Mar 18 16:55:56 2006
+++ SPECS/libexo.spec	Sun Jul 16 18:47:12 2006
@@ -3,24 +3,32 @@
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
 #
+%define		_pre		beta2
+%define		xfce_version	4.3.90.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.8
+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:	b8465faab19e233d5edda12bdd4940b4
 URL:		http://www.os-cillation.com/
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake
 BuildRequires:	gettext-devel
+BuildRequires:	gtk+2-devel >= 2:2.10.0
 BuildRequires:	gtk-doc >= 1.0
-BuildRequires:	gtk+2-devel >= 2:2.4.0
-BuildRequires:	libxfcegui4-devel >= 4.2.0
+BuildRequires:	libtool
+BuildRequires:	libxfce4util-devel >= %{xfce_version}
 BuildRequires:	pkgconfig
-BuildRequires:	python
-BuildRequires:	python-pygtk-devel >= 2:2.4.0
+BuildRequires:	python-pygtk-devel >= 2:2.9.3
 BuildRequires:	rpmbuild(macros) >= 1.219
+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)
 
@@ -30,12 +38,25 @@
 %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.0
+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.
@@ -81,12 +102,19 @@
 Pliki programistyczne wiązań Pythona do libexo.
 
 %prep
-%setup -q -n exo-%{version}
+%setup -q -n exo-%{version}%{_pre}
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
-	%{!?with_static_libs:--disable-static}
+	%{!?with_static_libs:--disable-static} \
+	--enable-xfce-mcs-manager
 %{__make}
 
 %install
@@ -95,6 +123,7 @@
 %{__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
@@ -107,18 +136,42 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	-n xfce-preferred-applications
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
+
+%postun	-n xfce-preferred-applications
+gtk-update-icon-cache -qf %{_datadir}/icons/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.*.*.*
 
+%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(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)
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/exo-0.3
 %{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/exo
+# not present in beta ?
+#%{_gtkdocdir}/exo
 
 %if %{with static_libs}
 %files static
@@ -144,6 +197,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/07/16 16:47:12  freetz
+- merged from DEVEL
+
+Revision 1.15.2.3  2006/07/16 16:46:28  freetz
+- 0.3.1.8beta2, updated: deps, file list, BR/R, --as-needed support added,
+  update icon cache
+
+Revision 1.15.2.2  2006/05/17 03:09:40  charles
+- regenerate ac/am/lt; updated BRs
+
+Revision 1.15.2.1  2006/05/03 16:56:47  freetz
+- 0.3.1.6beta1, added xfce-preferred-applications subpkg, fixed/updated BR
+
 Revision 1.15  2006/03/18 15:55:56  megabajt
 - modular xorg deps
 - added using py_postclean macro
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libexo.spec?r1=1.15&r2=1.16&f=u