X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=conglomerate.spec;h=9730b37f278e0b95a7ae1a8c4456f119fc0ba1b3;hb=977dd7c7eb239d2a5a7dbf6ee6c39847a3b92465;hp=7184ef88161d84035dcd03a44135d47a9656f999;hpb=76e587cc6aed19dae7fc5edadb256cb138b1eb11;p=packages%2Fconglomerate.git

diff --git a/conglomerate.spec b/conglomerate.spec
index 7184ef8..9730b37 100644
--- a/conglomerate.spec
+++ b/conglomerate.spec
@@ -1,19 +1,30 @@
 Summary:	Free user-friendly XML editor
-Summary(pl):	Wolnodostêpny, przyjazny dla u¿ytkownika edytor XML
+Summary(pl):	Wolnodostêpny, przyjazny dla u¿ytkownika edytor XML-a
 Name:		conglomerate
-Version:	0.7.6
+Version:	0.7.14
 Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5:	6333b54dbe3222fd71ff8917355adc94
+# Source0-md5:	1a04815a1059987aea45816aa1401bc3
 Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-locale-names.patch
+Patch2:		%{name}-missing_files.patch
 URL:		http://www.conglomerate.org/
-BuildRequires:	gtk+2-devel
-BuildRequires:	gtk-doc
-BuildRequires:	libglade2-devel
+BuildRequires:	GConf2-devel >= 2.4.0
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	gtk+2-devel >= 2:2.4.3
+BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	gtksourceview-devel >= 0.6
+BuildRequires:	intltool >= 0.30
+BuildRequires:	libglade2-devel >= 2.0.1
+BuildRequires:	libgnomeprintui-devel >= 2.4.0
 BuildRequires:	libgnomeui-devel >= 2.4.0
-BuildRequires:	libxslt-devel
+BuildRequires:	libxslt-devel >= 1.0.0
+Requires(post):	GConf2
+Requires(post):	scrollkeeper
+Requires:		gtk+2 >= 2:2.4.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -24,7 +35,7 @@ goal of the project is to create a free DocBook editor that Word users
 can easily learn.
 
 %description -l pl
-Conglomerate to wolnodostêpny, przyjazny dla u¿ytkownika edytor XML.
+Conglomerate to wolnodostêpny, przyjazny dla u¿ytkownika edytor XML-a.
 Próbuje ukryæ mordercze szczegó³y XML-a przed koñcowym u¿ytkownikiem.
 Potrafi obs³u¿yæ ka¿dy format pliku XML, ale jak na razie jego rozwój
 jest skoncentrowany na obs³udze dla DocBooka. Celem projektu jest
@@ -34,11 +45,23 @@ u
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+mv po/{no,nb}.po
 
 %build
+glib-gettextize --copy --force
+intltoolize --copy --force
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+%{__automake}
 %configure \
 	--enable-gtk-doc \
-	--with-html-dir=%{_gtkdocdir}
+	--disable-schemas-install \
+	--with-html-dir=%{_gtkdocdir} \
+	--enable-printing
 
 %{__make}
 
@@ -46,21 +69,29 @@ u
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 %find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /usr/bin/scrollkeeper-update
+%post
+/usr/bin/scrollkeeper-update
+%gconf_schema_install
+
 %postun -p /usr/bin/scrollkeeper-update
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr (755,root,root) %{_bindir}/*
+%{_sysconfdir}/gconf/schemas/*
 %{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*.png
+%{_pixmapsdir}/%{name}
 %{_omf_dest_dir}/*
 %{_gtkdocdir}/%{name}
+%{_datadir}/application-registry/*
+%{_datadir}/mime-info/*