X-Git-Url: http://git.pld-linux.org/?p=packages%2FToutDoux.git;a=blobdiff_plain;f=ToutDoux.spec;h=14abe9077a51bf39614a4068da3e7c78177a5804;hp=54885dbb6cbc4c8b9b9791cd785bf4bb567ff3b9;hb=32d2280f50f9abb09390d73f0741e7337c6baf18;hpb=c9eff4734758ca6e978bfd33902421cd07da58f4

diff --git a/ToutDoux.spec b/ToutDoux.spec
index 54885db..14abe90 100644
--- a/ToutDoux.spec
+++ b/ToutDoux.spec
@@ -1,30 +1,33 @@
 Summary:	Project manager
 Summary(pl):	Zarz±dca projektów
 Name:		ToutDoux
-Version:	1.2.6
-Release:	4
+Version:	1.2.7
+Release:	1
 License:	GPL
 Group:		Applications/Databases
-Group(de):	Applikationen/Dateibanken
-Group(pl):	Aplikacje/Bazy danych
-Source0:	http://toutdoux.sourceforge.net/pub/toutdoux/%{name}-%{version}.tar.gz
-Patch0:		%{name}-xml.patch
-URL:		http://toutdoux.sourceforge.net/
+Source0:	http://www.gnu.org/software/toutdoux/source/%{name}-%{version}.tar.gz
+# Source0-md5:	13eb83311422e447b88114e72155364d
+Patch0:		%{name}-configure.patch
+Patch1:		%{name}-am16.patch
+URL:		http://www.gnu.org/software/toutdoux/en/
 BuildRequires:	XFree86-devel
-BuildRequires:	bison
-BuildRequires:	gnome-libs-devel
-BuildRequires:	gtk+-devel >= 1.2.0
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	gettext-devel
-BuildRequires:	libxml-devel
+BuildRequires:	bison
+BuildRequires:	docbook-utils >= 0.6.10
 BuildRequires:	gdk-pixbuf-devel >= 0.9.0
+BuildRequires:	gettext-devel >= 0.10.35
+# ??? not in PLD
+BuildRequires:	getxml >= 1.0.3
+BuildRequires:	gtk+-devel >= 1.2.1
+BuildRequires:	gnome-libs-devel >= 1.0.8
+BuildRequires:	html-dtd401-sgml
+BuildRequires:	libtool
+BuildRequires:	libxml2-devel >= 2.3.5
+BuildRequires:	openjade >= 1.2.1
 BuildRequires:	postgresql-devel >= 7.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
+Obsoletes:	toutdoux
 
 %description
 ToutDoux is a project manager which permits management with different
@@ -32,52 +35,51 @@ views (based on plugins). For example, you can design a plan of
 actions using a tree structure.
 
 %description -l pl
-ToutDout jest programem do zarz±dzania projektami pozwalaj±cym na
-uwzglêdnianie ró¿nych punktów widzenia (bazuj±c na pluginach). Mo¿esz
-np. projektowaæ plan zadañ u¿ywaj±c struktury drzewiastej.
+ToutDoux jest programem do zarz±dzania projektami pozwalaj±cym na
+uwzglêdnianie ró¿nych punktów widzenia (bazuj±c na pluginach). Mo¿na
+za jego pomoc± np. projektowaæ plan zadañ u¿ywaj±c struktury
+drzewiastej.
 
 %package devel
-Summary:	%{name} libraries, includes, etc
-Summary(pl):	%{name} - pliki nag³ówkowe, etc
+Summary:	ToutDoux - includes, etc
+Summary(pl):	ToutDoux - pliki nag³ówkowe itp.
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(pl):	X11/Programowanie/Biblioteki
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	toutdoux-devel
 
 %description devel
-Header files for %{name}.
+Header files for ToutDoux.
 
-%description -l pl devel
-Pliki nag³ówkowe etc do %{name}.
+%description devel -l pl
+Pliki nag³ówkowe itp. do ToutDoux.
 
 %package static
-Summary:	%{name} static libraries
-Summary(pl):	Biblioteki statyczne hOpla
+Summary:	ToutDoux static libraries
+Summary(pl):	Biblioteki statyczne ToutDoux
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(pl):	X11/Programowanie/Biblioteki
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-%{name} static libraries.
+ToutDoux static libraries.
 
-%description -l pl static
-Biblioteki statyczne z funkcjami %{name}.
+%description static -l pl
+Biblioteki statyczne z funkcjami ToutDoux.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+echo 'Categories=Development;' >> toutdoux.desktop
 
 %build
-rm -f missing
-libtoolize --copy --force
-gettextize --copy --force
-aclocal -I %{_aclocaldir}/gnome
-autoconf
-automake -a -c
+%{__libtoolize}
+%{__gettextize}
+%{__aclocal} -I %{_aclocaldir}/gnome
+%{__autoconf}
+%{__automake}
 %configure  \
-	--with-gnome \
-	--without-included-gettext
+	--with-gnome
 %{__make}
 
 %install
@@ -85,21 +87,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	gmenudir=%{_applnkdir}/Utilities
-
-gzip -9nf AUTHORS ChangeLog NEWS README
+	gmenudir=%{_desktopdir}
 
 %find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz doc/en/toutdoux/*
+%doc AUTHORS ChangeLog NEWS README doc/en/toutdoux/*
 %attr(755,root,root) %{_bindir}/toutdoux
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %dir %{_libdir}/toutdoux
@@ -109,17 +109,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/toutdoux/*
 %{_pixmapsdir}/*.*
 %{_datadir}/toutdoux
-%{_applnkdir}/*/*
+%{_desktopdir}/*.desktop
 %{_datadir}/mime-info/*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*-config
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
 %{_includedir}/toutdoux
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/toutdoux/plugins/lib*.a
 %{_libdir}/lib*.a