- dropped unused patch3

- got rid of pld.conf

diff --git a/poldek.spec b/poldek.spec
index d05df8d822f4ca89421a0a0c278118a058f2ce0b..0cdd650a848818b0af233cf543787b718ac553c9 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -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
@@ -195,8 +194,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 +269,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