packages: exo/exo.spec - merged from DEVEL

megabajt megabajt at pld-linux.org
Wed Feb 16 18:44:14 CET 2011 

Author: megabajt                     Date: Wed Feb 16 17:44:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/exo:
   exo.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: packages/exo/exo.spec
diff -u packages/exo/exo.spec:1.45 packages/exo/exo.spec:1.46
--- packages/exo/exo.spec:1.45	Fri Feb  4 19:23:43 2011
+++ packages/exo/exo.spec	Wed Feb 16 18:44:08 2011
@@ -4,38 +4,36 @@
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	static_libs	# don't build static library
 #
-%define		xfce_version	4.6.2
+%define		xfce_version	4.8.0
 #
 Summary:	Extension library to Xfce developed by os-cillation
 Summary(pl.UTF-8):	Biblioteka rozszerzeń do Xfce opracowana przez os-cillation
 Name:		exo
-Version:	0.3.107
-Release:	4
+Version:	0.6.0
+Release:	1
 License:	GPL v2
 Group:		X11/Libraries
-Source0:	http://www.xfce.org/archive/xfce-%{xfce_version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5:	3a92cca0c99ee940db4410891c9e8498
+Source0:	http://archive.xfce.org/xfce/4.8/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	ac9deafdf9de426d8a03855ac549f424
 URL:		http://www.os-cillation.com/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.10.6
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.7}
+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:	hal-devel >= 0.5.7
 BuildRequires:	intltool >= 0.35.0
-BuildRequires:	libnotify-devel >= 0.4.0
 BuildRequires:	libtool
 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
-Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
+BuildRequires:	rpmbuild(macros) >= 1.601
+BuildRequires:	xfce4-dev-tools >= 4.8.0
+Requires:	glib2 >= 1:2.27.0
 Requires:	xfce4-dirs >= 4.6
 Provides:	libexo
 Obsoletes:	libexo
@@ -51,9 +49,9 @@
 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.
@@ -80,8 +78,7 @@
 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
@@ -144,11 +141,11 @@
 %{__autoconf}
 %configure \
 	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
-	--enable-hal \
 	--enable-notifications \
 	--enable-python \
 	--with-html-dir=%{_gtkdocdir} \
-	%{!?with_static_libs:--disable-static}
+	%{!?with_static_libs:--disable-static} \
+	--disable-silent-rules
 
 %{__make}
 
@@ -158,7 +155,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/exo-0.3/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/exo-*/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/{tl_PH,ur_PK}
 
 %{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/exo}
 
@@ -166,13 +166,13 @@
 
 %py_postclean
 
-%find_lang libexo-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
@@ -180,48 +180,42 @@
 %postun	-n xfce-preferred-applications
 %update_icon_cache hicolor
 
-%files -f libexo-0.3.lang
+%files -f exo-1.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS 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
+%doc AUTHORS ChangeLog HACKING NEWS README TODO
+%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/*.html
-%{_datadir}/xfce4/doc/C/images/*.png
-%lang(da) %{_datadir}/xfce4/doc/am/*.html
-%lang(da) %{_datadir}/xfce4/doc/am/images/*.png
-%lang(da) %{_datadir}/xfce4/doc/da/*.html
-%lang(da) %{_datadir}/xfce4/doc/da/images/*.png
-%lang(es) %{_datadir}/xfce4/doc/es/*.html
-%lang(es) %{_datadir}/xfce4/doc/es/images/*.png
-%lang(fr) %{_datadir}/xfce4/doc/fr/*.html
-%lang(fr) %{_datadir}/xfce4/doc/fr/images/*.png
-%lang(gl) %{_datadir}/xfce4/doc/gl/*.html
-%lang(gl) %{_datadir}/xfce4/doc/gl/images/*.png
-%lang(id) %{_datadir}/xfce4/doc/id/*.html
-%lang(id) %{_datadir}/xfce4/doc/id/images/*.png
-%lang(it) %{_datadir}/xfce4/doc/it/*.html
-%lang(it) %{_datadir}/xfce4/doc/it/images/*.png
-%lang(ja) %{_datadir}/xfce4/doc/ja/*.html
-%lang(ja) %{_datadir}/xfce4/doc/ja/images/*.png
-%lang(pt) %{_datadir}/xfce4/doc/pt/*.html
-%lang(pt) %{_datadir}/xfce4/doc/pt/images/*.png
-%lang(pt_BR) %{_datadir}/xfce4/doc/pt_BR/*.html
-%lang(pt_BR) %{_datadir}/xfce4/doc/pt_BR/images/*.png
-%lang(tr) %{_datadir}/xfce4/doc/tr/*.html
-%lang(tr) %{_datadir}/xfce4/doc/tr/images/*.png
-%lang(ug) %{_datadir}/xfce4/doc/ug/*.html
-%lang(ug) %{_datadir}/xfce4/doc/ug/images/*.png
+%dir %{_datadir}/doc/exo
+%dir %{_datadir}/doc/exo/html
+%{_datadir}/doc/exo/html/exo-preferred-applications.css
+%{_datadir}/doc/exo/html/C
+%lang(bn) %{_datadir}/doc/exo/html/bn
+%lang(ca) %{_datadir}/doc/exo/html/ca
+%lang(da) %{_datadir}/doc/exo/html/da
+%lang(de) %{_datadir}/doc/exo/html/de
+%lang(el) %{_datadir}/doc/exo/html/el
+%lang(es) %{_datadir}/doc/exo/html/es
+%lang(fr) %{_datadir}/doc/exo/html/fr
+%lang(gl) %{_datadir}/doc/exo/html/gl
+%lang(id) %{_datadir}/doc/exo/html/id
+%lang(it) %{_datadir}/doc/exo/html/it
+%lang(ja) %{_datadir}/doc/exo/html/ja
+%lang(pt) %{_datadir}/doc/exo/html/pt
+%lang(pt_BR) %{_datadir}/doc/exo/html/pt_BR
+%lang(ru) %{_datadir}/doc/exo/html/ru
+%lang(sv) %{_datadir}/doc/exo/html/sv
+%lang(tr) %{_datadir}/doc/exo/html/tr
+%lang(ug) %{_datadir}/doc/exo/html/ug
+%lang(zh_CN) %{_datadir}/doc/exo/html/zh_CN
 %dir %{_datadir}/xfce4/helpers
 %{_datadir}/xfce4/helpers/*.desktop
 %{_desktopdir}/*.desktop
@@ -233,37 +227,32 @@
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/exo-0.3
+%{_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]
+%dir %{py_sitedir}/exo-0.6
+%attr(755,root,root) %{py_sitedir}/exo-0.6/_exo.so
+%dir %{py_sitedir}/exo-0.6/exo
+%{py_sitedir}/exo-0.6/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
+%{_datadir}/pygtk/2.0/defs/exo-0.6
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -271,9 +260,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2011/02/16 17:44:08  megabajt
+- merged from DEVEL
+
+Revision 1.41.2.3  2011/02/07 21:47:39  megabajt
+- GIO module is not built with glib2 >= 2.27.0
+- drop libtool file
+
 Revision 1.45  2011/02/04 18:23:43  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
+Revision 1.41.2.2  2011/01/27 22:01:04  megabajt
+- updated to 0.6.0
+
 Revision 1.44  2010/11/14 16:49:36  baggins
 - rel 3
 - no ur_PK locale
@@ -284,6 +283,9 @@
 
 Revision 1.42  2010/11/14 12:35:54  baggins
 - 0.3.107, XFCE 4.6.2
+
+Revision 1.41.2.1  2010/11/14 12:05:05  baggins
+- 0.5.4, XFCE 4.8pre1
 
 Revision 1.41  2010/11/11 20:52:04  baggins
 - rel 5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/exo/exo.spec?r1=1.45&r2=1.46&f=u

More information about the pld-cvs-commit mailing list