X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=be41b6ec6bb13c0c4effea97e30800280a65e87f;hb=fdadb4084d282c9f10c2fe807e561cd72af02dd8;hp=d05df8d822f4ca89421a0a0c278118a058f2ce0b;hpb=acb1502a63a36a57f9ee1f7f00abf4c5bb47cd2b;p=packages%2Fpoldek.git

diff --git a/poldek.spec b/poldek.spec
index d05df8d..be41b6e 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -14,7 +14,7 @@
 %define	ver_rpm	4.5-49
 
 %define		snap	rc2
-%define		rel	4
+%define		rel	5
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -34,8 +34,7 @@ Source5:	%{name}.png
 Patch0:		%{name}-vserver-packages.patch
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-size-type.patch
-Patch3:		ac-prog-libtool.patch
-Patch4:		%{name}-Os-fail-workaround.patch
+Patch3:		%{name}-Os-fail-workaround.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -56,6 +55,7 @@ BuildRequires:	readline-devel >= 5.0
 BuildRequires:	rpm-devel >= %{ver_rpm}
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	swig-python
+BuildRequires:	xmlto
 BuildRequires:	zlib-devel
 %if %{with static}
 BuildRequires:	bzip2-static
@@ -195,8 +195,7 @@ Moduły języka Python dla poldka.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-%patch4 -p1
+%patch3 -p1
 
 rm -f m4/libtool.m4 m4/lt*.m4
 
@@ -271,7 +270,7 @@ cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 %endif
 
 # sources we don't package
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{rh,pld,fedora,centos}-source.conf
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{{rh,pld,fedora,centos}-source,repos.d/pld}.conf
 # include them in %doc
 rm -rf configs
 cp -a conf configs