SPECS: BitchX.spec, FreeMat.spec, aewan.spec, anyterm.spec, apache...

glen glen at pld-linux.org
Tue Dec 13 19:01:59 CET 2005


Author: glen                         Date: Tue Dec 13 18:01:59 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)

---- Files affected:
SPECS:
   BitchX.spec (1.86 -> 1.87) , FreeMat.spec (1.8 -> 1.9) , aewan.spec (1.5 -> 1.6) , anyterm.spec (1.11 -> 1.12) , apache1-mod_ssl.spec (1.107 -> 1.108) , ax25-apps.spec (1.25 -> 1.26) , axis-c.spec (1.3 -> 1.4) , bacula.spec (1.34 -> 1.35) , bgrab.spec (1.16 -> 1.17) , bibcursed.spec (1.3 -> 1.4) , bwm-tools.spec (1.9 -> 1.10) , cflowd.spec (1.6 -> 1.7) , cmatrix.spec (1.30 -> 1.31) , connmon.spec (1.18 -> 1.19) , cursel.spec (1.16 -> 1.17) , darcs.spec (1.14 -> 1.15) , db3.spec (1.62 -> 1.63) , db4.1.spec (1.12 -> 1.13) , db4.2.spec (1.74 -> 1.75) , db4.3.spec (1.13 -> 1.14) , db4.4.spec (1.2 -> 1.3) , detect.spec (1.13 -> 1.14) , djvulibre.spec (1.42 -> 1.43) , dopewars.spec (1.17 -> 1.18) , dosnet.spec (1.19 -> 1.20) , echat.spec (1.9 -> 1.10) , ekg.spec (1.200 -> 1.201) , erikyyyphone.spec (1.16 -> 1.17) , exim.spec (1.254 -> 1.255) , eximstate.spec (1.15 -> 1.16) , gdkxft.spec (1.57 -> 1.58) , globulation2.spec (1.22 -> 1.23) , imp3sh.spec (1.7 -> 1.8) , isdn4k-utils.spec (1.50 -> 1.51) , jnettop.spec (1.11 -> 1.12) , jsubedit.spec (1.12 -> 1.13) , krb5.spec (1.56 -> 1.57) , krecord.spec (1.21 -> 1.22) , lcdproc.spec (1.8 -> 1.9) , libedit.spec (1.11 -> 1.12) , mangoquest.spec (1.20 -> 1.21) , mikmod.spec (1.38 -> 1.39) , monotone.spec (1.16 -> 1.17) , motor.spec (1.27 -> 1.28) , mps.spec (1.6 -> 1.7) , multitail.spec (1.28 -> 1.29) , nct.spec (1.11 -> 1.12) , ne.spec (1.11 -> 1.12) , net-snmp.spec (1.65 -> 1.66) , nethack.spec (1.70 -> 1.71) , nethogs.spec (1.11 -> 1.12) , nload.spec (1.17 -> 1.18) , nocol.spec (1.10 -> 1.11) , ocaml-equeue.spec (1.13 -> 1.14) , ocaml-postgres.spec (1.14 -> 1.15) , omega.spec (1.11 -> 1.12) , omnitty.spec (1.8 -> 1.9) , oms.spec (1.19 -> 1.20) , openmosix-tools.spec (1.24 -> 1.25) , perl-JavaScript.spec (1.11 -> 1.12) , perl-cdk.spec (1.22 -> 1.23) , pice.spec (1.15 -> 1.16) , plex86.spec (1.31 -> 1.32) , pmars.spec (1.14 -> 1.15) , pnet.spec (1.78 -> 1.79) , proftpd.spec (1.213 -> 1.214) , prozilla.spec (1.37 -> 1.38) , pure-ftpd.spec (1.141 -> 1.142) , python.spec (1.2
41 -> 1.242) , qt.spec (1.346 -> 1.347) , qt4.spec (1.44 -> 1.45) , qtvu.spec (1.20 -> 1.21) , quickdc.spec (1.9 -> 1.10) , reed.spec (1.12 -> 1.13) , retawq.spec (1.10 -> 1.11) , rexima.spec (1.11 -> 1.12) , rgmanager.spec (1.3 -> 1.4) , rhide.spec (1.9 -> 1.10) , rogue.spec (1.28 -> 1.29) , rote.spec (1.7 -> 1.8) , rtorrent.spec (1.17 -> 1.18) , scli.spec (1.18 -> 1.19) , scom.spec (1.22 -> 1.23) , siag.spec (1.56 -> 1.57) , simulavr.spec (1.5 -> 1.6) , slashem.spec (1.12 -> 1.13) , snownews.spec (1.11 -> 1.12) , tclspice.spec (1.4 -> 1.5) , tcptrack.spec (1.8 -> 1.9) , tetradraw.spec (1.17 -> 1.18) , tn5250.spec (1.22 -> 1.23) , tolua++.spec (1.9 -> 1.10) , ttf2pt1.spec (1.9 -> 1.10) , tvision.spec (1.31 -> 1.32) , typespeed.spec (1.10 -> 1.11) , up-imapproxy.spec (1.10 -> 1.11) , util-linux.spec (1.270 -> 1.271) , wavemon.spec (1.8 -> 1.9) , wmSpaceWeather.spec (1.43 -> 1.44) , wmciv.spec (1.21 -> 1.22) , xawtv.spec (1.125 -> 1.126) , xfsdump.spec (1.37 -> 1.38) , xmms-input-speex.spec (1.9 -> 1.10) , ytalk.spec (1.38 -> 1.39) , yzis.spec (1.10 -> 1.11) , zile.spec (1.23 -> 1.24) , zinf.spec (1.33 -> 1.34) , zsh.spec (1.122 -> 1.123) 

---- Diffs:

================================================================
Index: SPECS/BitchX.spec
diff -u SPECS/BitchX.spec:1.86 SPECS/BitchX.spec:1.87
--- SPECS/BitchX.spec:1.86	Sun Dec  4 23:58:06 2005
+++ SPECS/BitchX.spec	Tue Dec 13 19:01:46 2005
@@ -79,7 +79,7 @@
 	bitchx-docs/findcomm
 
 %build
-CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses -fno-strict-aliasing"
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses -fno-strict-aliasing"
 %configure \
 	--enable-ipv6 \
 	--with-plugins=all
@@ -162,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.87  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.86  2005/12/04 22:58:06  glen
 - adapterized (sorted %verify flags)
 

================================================================
Index: SPECS/FreeMat.spec
diff -u SPECS/FreeMat.spec:1.8 SPECS/FreeMat.spec:1.9
--- SPECS/FreeMat.spec:1.8	Sat Jun 18 00:47:03 2005
+++ SPECS/FreeMat.spec	Tue Dec 13 19:01:46 2005
@@ -54,8 +54,8 @@
 %patch0
 
 %build
-CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
-CXXFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
+CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -89,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.8  2005/06/17 22:47:03  zbyniu
 - BR: XFree86-devel
 

================================================================
Index: SPECS/aewan.spec
diff -u SPECS/aewan.spec:1.5 SPECS/aewan.spec:1.6
--- SPECS/aewan.spec:1.5	Sun Oct 30 20:31:53 2005
+++ SPECS/aewan.spec	Tue Dec 13 19:01:46 2005
@@ -9,8 +9,8 @@
 Source0:	http://dl.sourceforge.net/aewan/%{name}-%{version}.tar.gz
 # Source0-md5:	89545338d1eba311297b520f9dc1b976
 URL:		http://aewan.sourceforge.net/
-BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	ncurses-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,7 +30,7 @@
 %setup -q
 
 %build
-CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 %{__aclocal}
 %{__autoconf}
 %configure
@@ -58,6 +58,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.5  2005/10/30 19:31:53  darekr
 - updated to 1.0.01
 

================================================================
Index: SPECS/anyterm.spec
diff -u SPECS/anyterm.spec:1.11 SPECS/anyterm.spec:1.12
--- SPECS/anyterm.spec:1.11	Wed Jul 20 07:51:41 2005
+++ SPECS/anyterm.spec	Tue Dec 13 19:01:46 2005
@@ -16,11 +16,11 @@
 # Source0-md5:	cf841703b7438866e573f5a33137ff6f
 Patch0:		%{name}-makefile.patch
 URL:		http://anyterm.org/
+BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.52-2
 BuildRequires:	apr-devel
 BuildRequires:	rote-devel >= 0.2.8
 BuildRequires:	rpmbuild(macros) >= 1.228
-BuildRequires:	%{apxs}
 Requires:	apache >= 2.0.52-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -124,6 +124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.11  2005/07/20 05:51:41  ankry
 - tab
 

================================================================
Index: SPECS/apache1-mod_ssl.spec
diff -u SPECS/apache1-mod_ssl.spec:1.107 SPECS/apache1-mod_ssl.spec:1.108
--- SPECS/apache1-mod_ssl.spec:1.107	Tue Oct 18 10:39:14 2005
+++ SPECS/apache1-mod_ssl.spec	Tue Dec 13 19:01:46 2005
@@ -51,8 +51,8 @@
 Requires:	apache1 >= %{APACHEVER}
 Requires:	apache1 >= 1.3.33-2
 # see the config
-Requires:	apache1-mod_setenvif
 Requires:	apache1-mod_log_config
+Requires:	apache1-mod_setenvif
 Provides:	apache(mod_ssl) = %{version}-%{release}
 Obsoletes:	apache-mod_ssl < 2
 Obsoletes:	mod_ssl
@@ -89,8 +89,8 @@
 
 %description -l es
 El módulo mod_ssl proporciona la criptografía para el servidor Web
-Apache, los sockets seguros, los protocolos de la seguridad (SSL) y
-de la capa tranparente (TLS).
+Apache, los sockets seguros, los protocolos de la seguridad (SSL) y de
+la capa tranparente (TLS).
 
 %description -l fr
 Le projet mod_ssl fournit de la forte cryptographie pour le serveur
@@ -303,6 +303,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.107  2005/10/18 08:39:14  qboosh
 - updated to 2.8.25-1.3.34
 

================================================================
Index: SPECS/ax25-apps.spec
diff -u SPECS/ax25-apps.spec:1.25 SPECS/ax25-apps.spec:1.26
--- SPECS/ax25-apps.spec:1.25	Mon Apr 26 15:48:10 2004
+++ SPECS/ax25-apps.spec	Tue Dec 13 19:01:46 2005
@@ -35,7 +35,7 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-AM_CFLAGS="-I%{_includedir}/ncurses"; export AM_CFLAGS
+AM_CFLAGS="-I/usr/include/ncurses"; export AM_CFLAGS
 %configure
 %{__make}
 
@@ -63,6 +63,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.25  2004/04/26 13:48:10  adamg
 - release 2 for Ac (1 is for Ra)
 

================================================================
Index: SPECS/axis-c.spec
diff -u SPECS/axis-c.spec:1.3 SPECS/axis-c.spec:1.4
--- SPECS/axis-c.spec:1.3	Mon Sep 13 21:30:34 2004
+++ SPECS/axis-c.spec	Tue Dec 13 19:01:46 2005
@@ -12,9 +12,9 @@
 Source0:	http://www.apache.org/dist/ws/axis-c/source/linux/%{name}-src-%{fversion}-linux.tar.gz
 # Source0-md5:	9c68ba2f2d8029aed0694881bc2f491b
 URL:		http://ws.apache.org/axis/
-BuildRequires:	apr-util-devel
-BuildRequires:	apr-devel
 BuildRequires:	apache-devel
+BuildRequires:	apr-devel
+BuildRequires:	apr-util-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
@@ -109,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.3  2004/09/13 19:30:34  qboosh
 - more informative Summary, unifications
 

================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.34 SPECS/bacula.spec:1.35
--- SPECS/bacula.spec:1.34	Wed Nov 30 15:58:58 2005
+++ SPECS/bacula.spec	Tue Dec 13 19:01:46 2005
@@ -83,8 +83,8 @@
 Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów.
 
 Bacula to zbiór programów umożliwiających administratorowi na
-zarządzanie kopiami zapasowymi, odzyskiwaniem i weryfikacją danych
-w sieci komputerów różnego rodzaju. W terminologii technicznej jest to
+zarządzanie kopiami zapasowymi, odzyskiwaniem i weryfikacją danych w
+sieci komputerów różnego rodzaju. W terminologii technicznej jest to
 program do kopii zapasowych pracujący w architekturze klient-serwer.
 Bacula jest stosunkowo łatwa w użyciu i wydajna, oferując przy tym
 wiele zaawansowanych możliwości przy zarządzaniu nośnikami,
@@ -101,9 +101,9 @@
 Conflicts:	bacula-console < 0:1.34.6
 Requires(post):	openssl-tools
 Requires(post):	sed >= 4.0
+Requires(post,preun):	/sbin/chkconfig
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(post,preun):	/sbin/chkconfig
 
 %description common
 Bacula - It comes by night and sucks the vital essence from your
@@ -121,8 +121,8 @@
 Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów.
 
 Bacula to zbiór programów umożliwiających administratorowi na
-zarządzanie kopiami zapasowymi, odzyskiwaniem i weryfikacją danych
-w sieci komputerów różnego rodzaju. W terminologii technicznej jest to
+zarządzanie kopiami zapasowymi, odzyskiwaniem i weryfikacją danych w
+sieci komputerów różnego rodzaju. W terminologii technicznej jest to
 program do kopii zapasowych pracujący w architekturze klient-serwer.
 Bacula jest stosunkowo łatwa w użyciu i wydajna, oferując przy tym
 wiele zaawansowanych możliwości przy zarządzaniu nośnikami,
@@ -134,8 +134,8 @@
 Summary(pl):	Usługi Bacula Director i Catalog
 Group:		Networking/Utilities
 Obsoletes:	%{name}-updatedb
-PreReq:		bacula-common = %{epoch}:%{version}-%{release}
 Requires(post):	sed >= 4.0
+Requires:	bacula-common = %{epoch}:%{version}-%{release}
 
 %description dir
 Bacula - It comes by night and sucks the vital essence from your
@@ -171,8 +171,8 @@
 Summary:	Bacula Console
 Summary(pl):	Konsola Baculi
 Group:		Networking/Utilities
-PreReq:		bacula-common = %{epoch}:%{version}-%{release}
 Requires(post):	sed >= 4.0
+Requires:	bacula-common = %{epoch}:%{version}-%{release}
 
 %description console
 Bacula - It comes by night and sucks the vital essence from your
@@ -193,8 +193,8 @@
 Summary:	Bacula wxWidgets Console
 Summary(pl):	Konsola Baculi oparta na wxWidgets
 Group:		Networking/Utilities
-PreReq:		bacula-common = %{epoch}:%{version}-%{release}
 Requires(post):	sed >= 4.0
+Requires:	bacula-common = %{epoch}:%{version}-%{release}
 
 %description console-wx
 Bacula - It comes by night and sucks the vital essence from your
@@ -215,16 +215,15 @@
 Summary:	Bacula GNOME Console
 Summary(pl):	Konsola Baculi oparta dla GNOME
 Group:		Networking/Utilities
-PreReq:		bacula-common = %{epoch}:%{version}-%{release}
 Requires(post):	sed >= 4.0
+Requires:	bacula-common = %{epoch}:%{version}-%{release}
 
 %description console-gnome
 Bacula - It comes by night and sucks the vital essence from your
 computers.
 
 Bacula Console is the program that allows the administrator or user to
-communicate with the Bacula Director. This is the GNOME GUI
-interface.
+communicate with the Bacula Director. This is the GNOME GUI interface.
 
 %description console-gnome -l pl
 Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów.
@@ -236,8 +235,8 @@
 %package tray-monitor
 Summary:	Bacula Tray Monitor
 Group:		Networking/Utilities
-PreReq:		bacula-common = %{epoch}:%{version}-%{release}
 Requires(post):	sed >= 4.0
+Requires:	bacula-common = %{epoch}:%{version}-%{release}
 
 %description tray-monitor
 Bacula - It comes by night and sucks the vital essence from your
@@ -253,8 +252,8 @@
 Summary:	Bacula File services (Client)
 Summary(pl):	Usługi Bacula File (klient)
 Group:		Networking/Utilities
-PreReq:		bacula-common = %{epoch}:%{version}-%{release}
 Requires(post):	sed >= 4.0
+Requires:	bacula-common = %{epoch}:%{version}-%{release}
 
 %description fd
 Bacula - It comes by night and sucks the vital essence from your
@@ -288,8 +287,8 @@
 Summary:	Bacula Storage services
 Summary(pl):	Usługi Bacula Storage
 Group:		Networking/Utilities
-PreReq:		bacula-common = %{epoch}:%{version}-%{release}
 Requires(post):	sed >= 4.0
+Requires:	bacula-common = %{epoch}:%{version}-%{release}
 Conflicts:	dvd+rw-tools <= 5.21.4.10.8-1
 
 %description sd
@@ -375,7 +374,7 @@
 
 %build
 cp -f %{_datadir}/automake/config.sub autoconf
-CPPFLAGS="-I%{_includedir}/ncurses -I%{_includedir}/readline"
+CPPFLAGS="-I/usr/include/ncurses -I%{_includedir}/readline"
 %configure \
 	--with-scriptdir=%{_libexecdir}/%{name} \
 	--%{!?with_gnome:dis}%{?with_gnome:en}able-gnome \
@@ -801,6 +800,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.34  2005/11/30 14:58:58  jajcus
 - Version: 1.3.8.2
 - bacula-gui sources commented out, as not used yet. Shouldn't that go

================================================================
Index: SPECS/bgrab.spec
diff -u SPECS/bgrab.spec:1.16 SPECS/bgrab.spec:1.17
--- SPECS/bgrab.spec:1.16	Wed Aug  6 18:34:23 2003
+++ SPECS/bgrab.spec	Tue Dec 13 19:01:46 2005
@@ -38,12 +38,12 @@
 chmod 755 configure
 
 %build
-CPPFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -I%{_includedir}/ncurses"
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -I%{_includedir}/ncurses"
-CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+CPPFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -I/usr/include/ncurses"
+CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -I/usr/include/ncurses"
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 %configure
 
-%{__make} CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions  -I%{_includedir}/ncurses"
+%{__make} CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions  -I/usr/include/ncurses"
 
 
 %install
@@ -66,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.16  2003/08/06 16:34:23  kloczek
 - może wrescie ktoś wykasuje to konto ?
 

================================================================
Index: SPECS/bibcursed.spec
diff -u SPECS/bibcursed.spec:1.3 SPECS/bibcursed.spec:1.4
--- SPECS/bibcursed.spec:1.3	Sun Sep 12 18:07:02 2004
+++ SPECS/bibcursed.spec	Tue Dec 13 19:01:46 2005
@@ -37,7 +37,7 @@
 %setup -q -n %{name}
 
 %build
-%{__cc} %{rpmcflags} -I%{_includedir}/ncurses -lncurses -o %{name} bibcursed.c
+%{__cc} %{rpmcflags} -I/usr/include/ncurses -lncurses -o %{name} bibcursed.c
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.3  2004/09/12 16:07:02  blues
 - cosmetic
 

================================================================
Index: SPECS/bwm-tools.spec
diff -u SPECS/bwm-tools.spec:1.9 SPECS/bwm-tools.spec:1.10
--- SPECS/bwm-tools.spec:1.9	Fri Oct 14 21:42:08 2005
+++ SPECS/bwm-tools.spec	Tue Dec 13 19:01:46 2005
@@ -43,7 +43,7 @@
 %{__autoconf}
 %configure
 %{__make} \
-    CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+    CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.9  2005/10/14 19:42:08  arekm
 - rebuild with new rrdtool
 

================================================================
Index: SPECS/cflowd.spec
diff -u SPECS/cflowd.spec:1.6 SPECS/cflowd.spec:1.7
--- SPECS/cflowd.spec:1.6	Thu May 13 22:31:33 2004
+++ SPECS/cflowd.spec	Tue Dec 13 19:01:46 2005
@@ -12,7 +12,7 @@
 Source1:	%{name}.init
 Patch0:		%{name}-yywrap.patch
 # http://net.doit.wisc.edu/~plonka/cflowd/cflowd-2-1-b1-djp.patch
-Patch1:		http://net.doit.wisc.edu/~plonka/cflowd/cflowd-djp.patch
+Patch1:		http://net.doit.wisc.edu/~plonka/cflowd/%{name}-djp.patch
 Patch2:		%{name}-gcc3.patch
 Patch3:		%{name}-link.patch
 Patch4:		%{name}-printf.patch
@@ -24,9 +24,9 @@
 BuildRequires:	flex
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	perl-base
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	rc-scripts
 Obsoletes:	cflowd0-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -190,6 +190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.6  2004/05/13 20:31:33  ankry
 - spaces -> tabs, other cosmetics
 

================================================================
Index: SPECS/cmatrix.spec
diff -u SPECS/cmatrix.spec:1.30 SPECS/cmatrix.spec:1.31
--- SPECS/cmatrix.spec:1.30	Wed Aug 18 21:33:55 2004
+++ SPECS/cmatrix.spec	Tue Dec 13 19:01:46 2005
@@ -44,7 +44,7 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 %configure \
 	--with-setfont
 %{__make}
@@ -86,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.30  2004/08/18 19:33:55  undefine
 - release 5
 

================================================================
Index: SPECS/connmon.spec
diff -u SPECS/connmon.spec:1.18 SPECS/connmon.spec:1.19
--- SPECS/connmon.spec:1.18	Mon May 30 22:58:48 2005
+++ SPECS/connmon.spec	Tue Dec 13 19:01:46 2005
@@ -13,8 +13,8 @@
 URL:		http://www.student.lu.se/~nbi98oli/
 BuildRequires:	adns-devel
 BuildRequires:	bison
-BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	gtk+-devel
+BuildRequires:	ncurses-devel >= 5.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,7 +38,7 @@
 
 %build
 %{__make} \
-	CFLAGS="-DHAVE_CONFIG_H -Wall `gtk-config --cflags` -I%{_includedir}/ncurses -I../compat -I../libconnmon -I../libhpnl -I.. -I. %{rpmcflags}"
+	CFLAGS="-DHAVE_CONFIG_H -Wall `gtk-config --cflags` -I/usr/include/ncurses -I../compat -I../libconnmon -I../libhpnl -I.. -I. %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.18  2005/05/30 20:58:48  zbyniu
 - BR: bison
 

================================================================
Index: SPECS/cursel.spec
diff -u SPECS/cursel.spec:1.16 SPECS/cursel.spec:1.17
--- SPECS/cursel.spec:1.16	Sat Nov 27 23:18:17 2004
+++ SPECS/cursel.spec	Tue Dec 13 19:01:46 2005
@@ -33,7 +33,7 @@
 %{__autoconf}
 %configure
 %{__make} \
-	OBJC="%{_bindir}/objc -Wc:%{rpmcflags} -I%{_includedir}/ncurses"\
+	OBJC="%{_bindir}/objc -Wc:%{rpmcflags} -I/usr/include/ncurses"\
 	LIBS="-lform -lmenu -lncurses %{rpmldflags}"
 
 %install
@@ -57,6 +57,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.16  2004/11/27 22:18:17  darekr
 - updated to 0.2.2
 - URL

================================================================
Index: SPECS/darcs.spec
diff -u SPECS/darcs.spec:1.14 SPECS/darcs.spec:1.15
--- SPECS/darcs.spec:1.14	Tue Nov 22 19:37:34 2005
+++ SPECS/darcs.spec	Tue Dec 13 19:01:46 2005
@@ -33,7 +33,7 @@
 %setup -q
 
 %build
-CPPFLAGS="-I%{_includedir}/ncurses"
+CPPFLAGS="-I/usr/include/ncurses"
 %configure
 %{__make}
 
@@ -61,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.14  2005/11/22 18:37:34  aredridel
 - up to 1.0.4
 - include bash completion

================================================================
Index: SPECS/db3.spec
diff -u SPECS/db3.spec:1.62 SPECS/db3.spec:1.63
--- SPECS/db3.spec:1.62	Fri Nov 18 20:22:08 2005
+++ SPECS/db3.spec	Tue Dec 13 19:01:46 2005
@@ -22,8 +22,8 @@
 URL:		http://www.sleepycat.com/
 BuildRequires:	db1-static
 BuildRequires:	glibc-static
-BuildRequires:	tcl-devel >= 8.3.4-10
 %{?with_java:BuildRequires:	java}
+BuildRequires:	tcl-devel >= 8.3.4-10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -332,6 +332,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2005/12/13 18:01:46  glen
+- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
+
 Revision 1.62  2005/11/18 19:22:08  qboosh
 - install in regular libdir
 

================================================================
Index: SPECS/db4.1.spec
diff -u SPECS/db4.1.spec:1.12 SPECS/db4.1.spec:1.13
--- SPECS/db4.1.spec:1.12	Fri Nov 18 20:36:48 2005
+++ SPECS/db4.1.spec	Tue Dec 13 19:01:46 2005
@@ -156,8 +156,8 @@
 Summary:	Berkeley database library for Tcl
 Summary(pl):	Biblioteka baz danych Berkeley dla Tcl
 Group:		Development/Languages/Tcl
-Requires:	tcl
 Requires:	%{name}-tcl = %{version}-%{release}
+Requires:	tcl
 Obsoletes:	db4-tcl
 Conflicts:	db-devel < 4.1.25-3
 
@@ -356,6 +356,9 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/BitchX.spec?r1=1.86&r2=1.87&f=u
    http://cvs.pld-linux.org/SPECS/FreeMat.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/aewan.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/anyterm.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_ssl.spec?r1=1.107&r2=1.108&f=u
    http://cvs.pld-linux.org/SPECS/ax25-apps.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/axis-c.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/bacula.spec?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/SPECS/bgrab.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/bibcursed.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/bwm-tools.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/cflowd.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/cmatrix.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/connmon.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/cursel.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/darcs.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/db3.spec?r1=1.62&r2=1.63&f=u
    http://cvs.pld-linux.org/SPECS/db4.1.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/db4.2.spec?r1=1.74&r2=1.75&f=u
    http://cvs.pld-linux.org/SPECS/db4.3.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/db4.4.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/detect.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/djvulibre.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/SPECS/dopewars.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/dosnet.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/echat.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/ekg.spec?r1=1.200&r2=1.201&f=u
    http://cvs.pld-linux.org/SPECS/erikyyyphone.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/exim.spec?r1=1.254&r2=1.255&f=u
    http://cvs.pld-linux.org/SPECS/eximstate.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/gdkxft.spec?r1=1.57&r2=1.58&f=u
    http://cvs.pld-linux.org/SPECS/globulation2.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/imp3sh.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/isdn4k-utils.spec?r1=1.50&r2=1.51&f=u
    http://cvs.pld-linux.org/SPECS/jnettop.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/jsubedit.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/krb5.spec?r1=1.56&r2=1.57&f=u
    http://cvs.pld-linux.org/SPECS/krecord.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/lcdproc.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/libedit.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/mangoquest.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/mikmod.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/SPECS/monotone.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/motor.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/mps.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/multitail.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/nct.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/ne.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/net-snmp.spec?r1=1.65&r2=1.66&f=u
    http://cvs.pld-linux.org/SPECS/nethack.spec?r1=1.70&r2=1.71&f=u
    http://cvs.pld-linux.org/SPECS/nethogs.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/nload.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/nocol.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/ocaml-equeue.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/ocaml-postgres.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/omega.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/omnitty.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/oms.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/openmosix-tools.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/perl-JavaScript.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/perl-cdk.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/pice.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/plex86.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/pmars.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/pnet.spec?r1=1.78&r2=1.79&f=u
    http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.213&r2=1.214&f=u
    http://cvs.pld-linux.org/SPECS/prozilla.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/pure-ftpd.spec?r1=1.141&r2=1.142&f=u
    http://cvs.pld-linux.org/SPECS/python.spec?r1=1.241&r2=1.242&f=u
    http://cvs.pld-linux.org/SPECS/qt.spec?r1=1.346&r2=1.347&f=u
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.44&r2=1.45&f=u
    http://cvs.pld-linux.org/SPECS/qtvu.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/quickdc.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/reed.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/retawq.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/rexima.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/rgmanager.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/rhide.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/rogue.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/rote.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/rtorrent.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/scli.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/scom.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/siag.spec?r1=1.56&r2=1.57&f=u
    http://cvs.pld-linux.org/SPECS/simulavr.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/slashem.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/snownews.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/tclspice.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/tcptrack.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/tetradraw.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/tn5250.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/tolua++.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/ttf2pt1.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/tvision.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/typespeed.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/up-imapproxy.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/util-linux.spec?r1=1.270&r2=1.271&f=u
    http://cvs.pld-linux.org/SPECS/wavemon.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/wmSpaceWeather.spec?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/SPECS/wmciv.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/xawtv.spec?r1=1.125&r2=1.126&f=u
    http://cvs.pld-linux.org/SPECS/xfsdump.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/xmms-input-speex.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/ytalk.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/SPECS/yzis.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/zile.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/zinf.spec?r1=1.33&r2=1.34&f=u
    http://cvs.pld-linux.org/SPECS/zsh.spec?r1=1.122&r2=1.123&f=u




More information about the pld-cvs-commit mailing list