X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexo.git;a=blobdiff_plain;f=exo.spec;h=39853c4884d7a7e417c6b7e82fb707f7a05fb3c8;hp=249de3559e445622dfce2f7c22d801e66a07788f;hb=5b3fbbded51c227d0120cf6234963005258d363b;hpb=737f4d4fc7ab060c7375dca4679fe5bb0fcf55c1

diff --git a/exo.spec b/exo.spec
index 249de35..39853c4 100644
--- a/exo.spec
+++ b/exo.spec
@@ -1,112 +1,112 @@
 #
 # Conditional build:
-%bcond_without	static_libs	# don't build static library
-#
-%define		_pre		rc1
-%define		xfce_version	4.3.99.1
-#
+%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):	Biblioteka rozszerzeñ do Xfce opracowana przez os-cillation
-Name:		libexo
-Version:	0.3.1.10
-Release:	0.%{_pre}.1
+Summary(pl.UTF-8):	Biblioteka rozszerzeń do Xfce opracowana przez os-cillation
+Name:		exo
+Version:	0.10.2
+Release:	1
 License:	GPL v2
-Group:		Libraries
-Source0:	http://www.xfce.org/archive/xfce-%{xfce_version}/src/exo-%{version}%{_pre}.tar.bz2
-# Source0-md5:	98d5493c898ab54b82b0835fc0e6df87
+Group:		X11/Libraries
+Source0:	http://archive.xfce.org/src/xfce/exo/0.10/%{name}-%{version}.tar.bz2
+# Source0-md5:	c70f2a217811bfba2e62f938d4b8f748
 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.1
-BuildRequires:	gtk-doc >= 1.0
+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:	libtool
+BuildRequires:	libxfce4ui-devel >= %{xfce_version}
 BuildRequires:	libxfce4util-devel >= %{xfce_version}
 BuildRequires:	perl-URI
 BuildRequires:	pkgconfig
-BuildRequires:	python-pygtk-devel >= 2:2.9.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
+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
 Extension library to Xfce developed by os-cillation.
 
-%description -l pl
-Biblioteka rozszerzeñ do Xfce opracowana przez os-cillation.
+%description -l pl.UTF-8
+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(post,postun):	hicolor-icon-theme
-Requires:	xfce-mcs-plugins >= %{xfce_version}
+Summary(pl.UTF-8):	Struktura Preferowanych Aplikacji Xfce
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
 
 %description -n xfce-preferred-applications
 The Xfce Preferred Applications framework.
 
-%description -n xfce-preferred-applications -l pl
+%description -n xfce-preferred-applications -l pl.UTF-8
 Struktura Preferowanych Aplikacji Xfce.
 
+%package apidocs
+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.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API libexo.
+
 %package devel
 Summary:	Header files for libexo library
-Summary(pl):	Pliki nag³ówkowe biblioteki libexo
-Group:		Development/Libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libexo
+Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+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.
 
-%description devel -l pl
-Pliki nag³ówkowe biblioteki libexo.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libexo.
 
 %package static
 Summary:	Static libexo library
-Summary(pl):	Statyczna biblioteka libexo
-Group:		Development/Libraries
+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.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna biblioteka libexo.
 
-%package -n python-exo
-Summary:	Python binding for libexo library
-Summary(pl):	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
-Wi±zania Pythona do biblioteki libexo.
-
-%package -n python-exo-devel
-Summary:	Development files for libexo Python bindings
-Summary(pl):	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
-Pliki programistyczne wi±zañ Pythona do libexo.
-
 %prep
-%setup -q -n exo-%{version}%{_pre}
+%setup -q
+
+%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 
 %build
+%{?with_apidocs:%{__gtkdocize}}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
@@ -114,29 +114,32 @@ Pliki programistyczne wi
 %{__automake}
 %{__autoconf}
 %configure \
+	--%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
 	--with-html-dir=%{_gtkdocdir} \
 	%{!?with_static_libs:--disable-static} \
-	--enable-xfce-mcs-manager
+	--disable-silent-rules
+
 %{__make}
 
 %install
 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}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# 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
@@ -144,21 +147,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}/lib*.so.*.*.*
-%{_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}/xfce4/mcs-plugins/exo-preferred-applications-settings.so
+%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(ja) %{_datadir}/xfce4/doc/ja
 %dir %{_datadir}/xfce4/helpers
 %{_datadir}/xfce4/helpers/*.desktop
 %{_desktopdir}/*.desktop
@@ -167,29 +169,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-1
+%endif
+
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/exo-0.3
-%{_pkgconfigdir}/*.pc
-# not present in beta ?
-#%{_gtkdocdir}/exo
+%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}/lib*.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