X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpoldek.git;a=blobdiff_plain;f=poldek.spec;h=6d0d0b49870ab447ab5b818b144f9735c7f2bf6d;hp=fec193ddb105220f665a0f19292fbfaed61922bd;hb=9700e5f11ca60624fb09f160d659fd07fee1af60;hpb=332586009a646e37f16665bed1b56144c8d258f1

diff --git a/poldek.spec b/poldek.spec
index fec193d..6d0d0b4 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -14,7 +14,7 @@
 %define	ver_rpm	4.5-49
 
 %define		snap	rc2
-%define		rel	3
+%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
@@ -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
 
@@ -250,15 +248,15 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d
 	%define		_ftp_arch	i686
 %endif
 
-%define	pld_conf %{SOURCE1}
+%define	tld_conf %{SOURCE1}
 %ifarch %{x8664}
-	%define	pld_multilib_conf %{SOURCE2}
+	%define	tld_multilib_conf %{SOURCE2}
 %endif
 
-sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+sed -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{tld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/tld.conf
 
-%if 0%{?pld_multilib_conf:1}
-	sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{pld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+%if 0%{?tld_multilib_conf:1}
+	sed 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{tld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/tld-multilib.conf
 %endif
 
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
@@ -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
@@ -368,15 +366,15 @@ fi
 %{__sed} -i -e '/%%include %%{_distro}-source.conf/d' %{_sysconfdir}/%{name}/poldek.conf
 %{__sed} -i -e '/%%include %%{_distro}-multilib-source.conf/d' %{_sysconfdir}/%{name}/poldek.conf
 
-if [ -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave ]; then
-	cp -f %{_sysconfdir}/%{name}/repos.d/pld.conf{,.rpmnew}
-	cp -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld.conf
+if [ -f %{_sysconfdir}/%{name}/tld-source.conf.rpmsave ]; then
+	cp -f %{_sysconfdir}/%{name}/repos.d/tld.conf{,.rpmnew}
+	cp -f %{_sysconfdir}/%{name}/tld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/tld.conf
 fi
 
 %ifarch %{x8664}
-if [ -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then
-	cp -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf{,.rpmnew}
-	cp -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+if [ -f %{_sysconfdir}/%{name}/tld-multilib-source.conf.rpmsave ]; then
+	cp -f %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf{,.rpmnew}
+	cp -f %{_sysconfdir}/%{name}/tld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/tld-multilib.conf
 fi
 %endif