From 849ed81e397be9f1eb08d38d0788b9a77b30608c Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Fri, 27 Feb 2009 17:21:15 +0000 Subject: [PATCH] - updated to 0.3.100 - removed obsolete -locale-names.patch and -teardown-crypto-on-eject.patch Changed files: exo.spec -> 1.32 --- exo.spec | 72 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/exo.spec b/exo.spec index ac13216..346d65d 100644 --- a/exo.spec +++ b/exo.spec @@ -4,38 +4,34 @@ # Conditional build: %bcond_without static_libs # don't build static library # -%define xfce_version 4.4.3 +%define xfce_version 4.6.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.4 -Release: 5 +Version: 0.3.100 +Release: 1 License: GPL v2 -Group: Libraries +Group: X11/Libraries Source0: http://www.xfce.org/archive/xfce-%{xfce_version}/src/exo-%{version}.tar.bz2 -# Source0-md5: 7a1af943b1df32b6f89ae91823118a22 -Patch0: %{name}-locale-names.patch -Patch1: %{name}-teardown-crypto-on-eject.patch +# Source0-md5: ebded97ff55f43cd0fe6b16242992ecf 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.0 +BuildRequires: hal-devel >= 0.5.7 BuildRequires: intltool >= 0.35.0 -BuildRequires: libtool 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: xfce-mcs-manager-devel >= %{xfce_version} -BuildRequires: xfce4-dev-tools >= 4.4.0.1 -BuildRequires: xorg-lib-libXt-devel +BuildRequires: xfce4-dev-tools >= 4.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -47,10 +43,10 @@ Biblioteka rozszerzeń do Xfce opracowana przez os-cillation. %package -n xfce-preferred-applications Summary: The Xfce Preferred Applications framework Summary(pl.UTF-8): Struktura Preferowanych Aplikacji Xfce -Group: Applications +Group: X11/Applications Requires(post,postun): gtk+2 Requires(post,postun): hicolor-icon-theme -Requires: xfce-mcs-plugins >= %{xfce_version} +Requires: %{name} = %{version}-%{release} %description -n xfce-preferred-applications The Xfce Preferred Applications framework. @@ -73,8 +69,10 @@ Dokumentacja API libexo. %package devel Summary: Header files for libexo library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libexo -Group: Development/Libraries +Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: gtk+2-devel >= 2:2.10.6 +Requires: hal-devel >= 0.5.7 Requires: libxfce4util-devel >= %{xfce_version} %description devel @@ -86,7 +84,7 @@ Pliki nagłówkowe biblioteki libexo. %package static Summary: Static libexo library Summary(pl.UTF-8): Statyczna biblioteka libexo -Group: Development/Libraries +Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static @@ -122,11 +120,6 @@ Pliki programistyczne wiązań Pythona do libexo. %prep %setup -q -n exo-%{version} -%patch0 -p1 -%patch1 -p0 - -mv -f po/{pt_PT,pt}.po -mv -f po/{nb_NO,nb}.po %build %{__intltoolize} @@ -141,8 +134,7 @@ mv -f po/{nb_NO,nb}.po --enable-notifications \ --with-html-dir=%{_gtkdocdir} \ %{!?with_static_libs:--disable-static} \ - --enable-python \ - --enable-mcs-plugin + --enable-python %{__make} %install @@ -151,7 +143,9 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.{la,a} +mv $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,} +mv $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,} + rm -f $RPM_BUILD_ROOT%{py_sitedir}/exo-0.3/*.{la,a} %py_postclean @@ -173,8 +167,11 @@ rm -rf $RPM_BUILD_ROOT %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/ +%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 %files -n xfce-preferred-applications %defattr(644,root,root,755) @@ -182,11 +179,14 @@ rm -rf $RPM_BUILD_ROOT %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 -%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 +%{_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 @@ -201,15 +201,19 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/lib*.so -%{_libdir}/lib*.la +%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}/*.pc +%{_pkgconfigdir}/exo-0.3.pc +%{_pkgconfigdir}/exo-hal-0.3.pc %if %{with static_libs} %files static %defattr(644,root,root,755) -%{_libdir}/lib*.a +%{_libdir}/libexo-0.3.a +%{_libdir}/libexo-hal-0.3.a %endif %files -n python-exo -- 2.44.0