SPECS (AC-branch): automake.spec - drop quoteld patch, it's proble...

glen glen at pld-linux.org
Mon Oct 30 17:52:32 CET 2006


Author: glen                         Date: Mon Oct 30 16:52:32 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- drop quoteld patch, it's problem in KDE build system not here
- /usr/share/aclocal in filesystem now.
- rel 4

---- Files affected:
SPECS:
   automake.spec (1.118 -> 1.118.2.1) 

---- Diffs:

================================================================
Index: SPECS/automake.spec
diff -u SPECS/automake.spec:1.118 SPECS/automake.spec:1.118.2.1
--- SPECS/automake.spec:1.118	Thu Apr  6 23:51:02 2006
+++ SPECS/automake.spec	Mon Oct 30 17:52:27 2006
@@ -1,8 +1,4 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	quoteld		# with quote $LD patch, fixes kde packages build with %{__cc}=ccache gcc, but breaks nagios-plugins
-#
 %include	/usr/lib/rpm/macros.perl
 Summary:	GNU automake - Makefile configuration tools
 Summary(de):	GNU automake - Makefile-Konfigurationstools
@@ -16,7 +12,7 @@
 Summary(uk):	GNU automake - ŚÎÓÔŇŐÍĹÎÔÉ ÄĚŃ Á×ÔĎÍÁÔÉŢÎϧ ÇĹÎĹŇÁĂŚ§ Makefile'Ś×
 Name:		automake
 Version:	1.9.6
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL
 Group:		Development/Building
@@ -27,12 +23,12 @@
 Patch2:		%{name}-no_versioned_dir.patch
 Patch3:		%{name}-CCASCOMPILE-output.patch
 Patch4:		%{name}-morearchs.patch
-Patch5:		%{name}-quoteld.patch
 URL:		http://sources.redhat.com/automake/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	rpm-perlprov
 BuildRequires:	texinfo >= 4.7
 Requires(pre):	fileutils
+Requires:	filesystem >= 2.0-1
 Requires:	perl(File::Glob)
 Conflicts:	autoconf < 2.58
 Conflicts:	libtool < 2:1.5-11
@@ -97,7 +93,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%{?with_quoteld:%patch5 -p1}
 
 %build
 %{__autoconf}
@@ -132,7 +127,7 @@
 %attr(755,root,root) %{_bindir}/*
 %{_infodir}/automake*
 
-%{_aclocaldir}
+%{_aclocaldir}/*
 %{_mandir}/man1/*
 
 %dir %{_datadir}/automake
@@ -163,6 +158,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118.2.1  2006/10/30 16:52:27  glen
+- drop quoteld patch, it's problem in KDE build system not here
+- /usr/share/aclocal in filesystem now.
+- rel 4
+
 Revision 1.118  2006/04/06 21:51:02  glen
 - bcond quoteld patch, rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/automake.spec?r1=1.118&r2=1.118.2.1&f=u



More information about the pld-cvs-commit mailing list