SPECS: kdebase.spec - rel 4 - cut changelog - modular xorg deps - ...

wolf wolf at pld-linux.org
Mon Feb 20 02:27:45 CET 2006


Author: wolf                         Date: Mon Feb 20 01:27:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4
- cut changelog
- modular xorg deps
- enable hidden visibility

---- Files affected:
SPECS:
   kdebase.spec (1.491 -> 1.492) 

---- Diffs:

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.491 SPECS/kdebase.spec:1.492
--- SPECS/kdebase.spec:1.491	Sat Feb 11 15:25:32 2006
+++ SPECS/kdebase.spec	Mon Feb 20 02:27:39 2006
@@ -10,7 +10,7 @@
 %bcond_without	apidocs		# Do not prepare API documentation
 %bcond_without	ldap		# build or not ldap ioslave
 %bcond_with	kerberos5	# kerberos 5 support
-%bcond_with	hidden_visibility	# pass '--fvisibility=hidden'
+%bcond_without	hidden_visibility	# pass '--fvisibility=hidden'
 					# & '--fvisibility-inlines-hidden'
 					# to g++
 #
@@ -30,7 +30,7 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	%{_ver}
-Release:	3
+Release:	4
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -108,8 +108,6 @@
 BuildRequires:	lm_sensors-devel
 BuildRequires:	motif-devel
 BuildRequires:	openssl-devel >= 0.9.7c
-# kde requires libXext and more stuff that is X11-only juz grep X11 `find -name configure.in.in`
-BuildRequires:	X11-devel >= 1:6.8.1
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
@@ -119,7 +117,19 @@
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
 #BuildRequires:	unsermake >= 040511
-BuildRequires:	xcursor-devel >= 1.1.0
+BuildRequires:	xorg-app-bdftopcf
+BuildRequires:	xorg-cf-files
+BuildRequires:	xorg-lib-libXcomposite-devel
+BuildRequires:	xorg-lib-libXcursor-devel
+BuildRequires:	xorg-lib-libXdamage-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXinerama-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXtst-devel
+BuildRequires:	xorg-lib-libfontenc-devel
+BuildRequires:	xorg-lib-libxkbfile-devel
+BuildRequires:	xorg-proto-scrnsaverproto-devel
+BuildRequires:	xorg-util-imake
 BuildConflicts:	kdebase-konqueror-libs
 Conflicts:	kdelibs < 9:3.1.94.040110-1
 # TODO: sensors
@@ -544,7 +554,6 @@
 Requires:	kde-splash-Default
 Requires:	konqueror = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.79.0
-Requires:	xcursor >= 1.1.0
 Obsoletes:	kde-theme-keramik
 Obsoletes:	kdebase
 Obsoletes:	kdebase-fonts
@@ -925,8 +934,8 @@
 Requires:	kde-kgreet
 Requires:	pam >= 0.79.0
 Requires:	rc-scripts
-Requires:	sessreg
 Requires:	xinitrc-ng >= 0.4
+Requires:	xorg-app-sessreg
 Obsoletes:	X11-xdm
 Obsoletes:	entrance
 Obsoletes:	gdm
@@ -2861,6 +2870,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.492  2006/02/20 01:27:39  wolf
+- rel 4
+- cut changelog
+- modular xorg deps
+- enable hidden visibility
+
 Revision 1.491  2006/02/11 14:25:32  arekm
 - branch patch updated
 
@@ -2887,326 +2902,3 @@
 Revision 1.484  2006/01/14 12:39:01  pluto
 - kill --enable-final.
   it's only a compile-time memory hog without visible optimizations.
-
-Revision 1.483  2005/12/31 17:00:27  arekm
-- upstream fixes; rel++
-
-Revision 1.482  2005/12/14 09:31:36  glen
-- added dot back for etc (deapterized)
-- sorted R/BR (adapterized)
-
-Revision 1.481  2005/12/10 15:19:39  blekot
-- readded jpegtran-rotate
-- rel 5
-
-Revision 1.480  2005/12/09 07:02:29  ankry
-- reverted
-
-Revision 1.478  2005/12/08 11:53:04  adgor
-- hidden_visibility bcond
-
-Revision 1.477  2005/12/07 00:45:28  glen
-- apply branch diff
-- adapterized
-- rel 3
-
-Revision 1.476  2005/11/28 14:50:01  qboosh
-- acl-devel dep belongs to kdelibs
-
-Revision 1.475  2005/11/27 15:10:32  charles
-- devel BR: acl-devel
-
-Revision 1.474  2005/11/26 14:11:16  arekm
-- rel 2; new tarball
-
-Revision 1.473  2005/11/23 13:44:32  arekm
-- rel 1
-
-Revision 1.472  2005/11/21 16:39:00  glen
-- update md5
-- force --with-openexr as it's in files list (not to be suprised after compilation openexr files were silently not compiled)
-
-Revision 1.471  2005/11/19 18:48:59  glen
-- no need to escape double quote for banner
-
-Revision 1.470  2005/11/15 10:59:56  qboosh
-- sorted verify() flags
-
-Revision 1.469  2005/11/15 09:18:30  adgor
-- missing files
-
-Revision 1.468  2005/11/13 21:38:48  arekm
-- updates; some patches fixed
-
-Revision 1.467  2005/11/13 01:34:54  arekm
-- partial update to 3.5.0rc1 (a lot of work still needed)
-
-Revision 1.466  2005/11/07 17:34:34  blekot
-- added servicemenu to rotate jpeg without loosing compesion using jpegtran
-- regenated kdebase-servicemenus.tar.bz2 and added to dropin.pld-linux.org
-
-Revision 1.465  2005/10/30 12:21:49  arekm
-- rel 2
-
-Revision 1.464  2005/10/09 17:44:09  arekm
-- rel 1
-
-Revision 1.463  2005/10/06 20:14:49  arekm
-- BR rpm-pythonprov
-
-Revision 1.462  2005/10/06 18:12:45  arekm
-- up to 3.4.3
-
-Revision 1.461  2005/09/05 12:07:20  arekm
-- rel 6; fixes kcheckpass local root vuln (SECURITY)
-
-Revision 1.460  2005/09/04 15:19:54  arekm
-- rel 5; new dbus
-
-Revision 1.459  2005/08/26 17:40:26  arekm
-- rel 4
-
-Revision 1.458  2005/08/16 17:26:31  glen
-- move kwriteconfig to -desktop package (it's not kwrite related program)
-
-Revision 1.457  2005/08/07 14:11:28  arekm
-- rel 3; fixes issue with [] in filenames.
-
-Revision 1.456  2005/08/04 06:27:43  arekm
-- rel 2
-
-Revision 1.455  2005/08/02 06:07:17  arekm
-- readd branch patch
-
-Revision 1.454  2005/07/28 17:18:44  arekm
-- rel 1
-
-Revision 1.453  2005/07/25 20:45:13  glen
-- patch for console wordseparators to be able to select common urls
-
-Revision 1.452  2005/07/21 16:22:07  arekm
-- up to 3.4.2
-
-Revision 1.451  2005/07/10 11:10:16  arekm
-- disable krb5 by default
-
-Revision 1.450  2005/07/07 17:32:48  arekm
-- rel 4
-
-Revision 1.449  2005/07/07 17:32:18  arekm
-- fix
-
-Revision 1.448  2005/07/04 17:54:39  arekm
-- fix kdialog req; enable kerberos5 (needs fixed X11 headers first)
-
-Revision 1.447  2005/07/04 11:49:14  baggins
-- stop being uber-smart and just use TERM=xterm (not xterm-color),
-  like the rest of the world does
-
-Revision 1.446  2005/06/20 18:28:14  djurban
-- update the md5 sum of new colorschemes tarball
-
-Revision 1.445  2005/06/11 11:51:43  glen
-- kdebase-desktop R(eject) for kdeeject
-
-Revision 1.444  2005/06/11 11:49:01  glen
-- kdebase-desktop R(kdebase-kdialog) for kdeeject:
-  /usr/bin/kdeeject[36]: kdialog: not found
-
-Revision 1.443  2005/06/02 18:14:45  glen
-- findutils already required by rpm-build
-
-Revision 1.442  2005/05/31 20:56:35  arekm
-- rel 1
-
-Revision 1.441  2005/05/26 07:54:58  arekm
-- up to 3.4.1
-
-Revision 1.440  2005/05/25 11:27:28  hawk
-- added PAM config kdm-np to fix not working autologin feature in KDM
-
-Revision 1.439  2005/05/13 22:18:14  ankry
-- rel. 8
-
-Revision 1.438  2005/05/13 17:51:57  arekm
-- add Conflicts:      kdeedu-libkdeeduui < 8:3.4.0
-
-Revision 1.437  2005/05/13 17:40:47  ankry
-- added C:kttsd, rel. 7
-
-Revision 1.436  2005/05/12 15:15:48  baggins
-- release 6
-- req pam 0.79
-
-Revision 1.435.2.1.2.2  2005/11/12 21:04:09  djurban
-- commit recent versions to help arekm with 3.5
-
-Revision 1.435.2.1.2.1  2005/06/23 10:01:18  djurban
-- buahahaha we have blastoff, kdepim next? or maybe kdenetwork?
-
-Revision 1.435.2.1  2005/05/03 10:42:20  adgor
-- 3.4.89
-
-Revision 1.435  2005/04/24 11:07:20  arekm
-- fail when building with apidocs when kdelibs had excluded docs.
-
-Revision 1.434  2005/04/19 04:51:41  arekm
-- rel 4
-
-Revision 1.433  2005/04/18 08:28:24  charles
-- removed BR: mDNSResponder-devel (it's with kdelibs-devel)
-
-Revision 1.432  2005/04/15 16:42:56  charles
-- BR: mDNSResponder-devel
-
-Revision 1.431  2005/04/15 06:21:23  charles
-- BR: bzip2-devel, pkgconfig
-
-Revision 1.430  2005/04/13 06:47:16  pluto
-- konqueror startup crasch fixed.
-- release 3.
-
-Revision 1.429  2005/04/09 02:46:13  pluto
-- +%patch20 (gcc4 workaround) mssed during -devel merge.
-
-Revision 1.428  2005/04/03 19:02:51  adgor
-- Grr... kmenuedit must be included ... another stupid construction
-
-Revision 1.427  2005/04/01 17:16:29  adgor
-- Release 2
-
-Revision 1.426  2005/03/29 10:42:40  djurban
-- extend requires
-- added branch diff
-- added notes about other possible options
-- remove IMPROPER strict deps in splashes
-- add distribution identifier
-- move fixing google's polish address to %prep
-- updated searchproviders: added wpl as shortcut to pl.wikipdia.org's search,
-  wp will be the shortcut for the en version
-- i should update the colorschemes today's evening/tommorow
-
-Revision 1.425  2005/03/28 13:43:22  adgor
-- Do not include messing desktop files
-- Do not include useless menu
-- kcm_fonts.patch commented out - must be reviewed since kdelibs-defaultfont
-  patch is outdated
-
-Revision 1.424  2005/03/28 13:15:36  wolf
-- don't require more than necessary
-
-Revision 1.423  2005/03/28 10:19:54  arekm
-- no mechanism to search for other splashes than default -> R: kde-splash-Default
-
-Revision 1.422  2005/03/26 16:56:33  arekm
-- rel 1; add missing requires (mkochano)
-
-Revision 1.421  2005/03/18 15:11:50  saq
-- seesar.patch forwardported from AC-branch
-
-Revision 1.420  2005/03/18 08:29:58  adgor
-- Typo
-
-Revision 1.419  2005/03/16 21:39:25  qboosh
-- unified attr format
-
-Revision 1.418  2005/03/16 18:30:23  arekm
-- on ftp it sits in 3.4 dir
-
-Revision 1.417  2005/03/16 18:07:59  blekot
-- Source0 fix
-
-Revision 1.416  2005/03/16 17:14:29  arekm
-- merged from DEVEL
-
-Revision 1.415  2005/03/06 10:41:46  glen
-- fixed %banner usage
-
-Revision 1.414  2005/02/27 18:10:40  saq
-- introducing Seesar Search support
-
-Revision 1.413  2005/02/04 14:22:09  pzurowski
-- BR: rpmbuild(macros) >= 1.176 due to:
-- %banner support
-
-Revision 1.412  2005/01/09 23:29:30  paszczus
-- added R: pciutils (lspci needed in infocenter)
-
-Revision 1.411  2005/01/08 19:48:09  sparky
-- O: entrance
-
-Revision 1.410  2004/12/14 23:49:50  havner
-- patch21 already in branch diff
-
-Revision 1.409  2004/12/14 23:20:35  havner
-- post 3.3.2 branch diff
-
-Revision 1.408  2004/12/12 23:10:01  ankry
-- 3.3.2; thanks to Michal Kochanowicz
-
-Revision 1.407  2004/12/02 20:02:26  djurban
-- rel. 8, apidocs fix, will stbr both kdelisb and base to ac tommorow, thinking about kdepim (many fixes)
-
-Revision 1.406  2004/11/16 11:10:26  qboosh
-- missing changelog entry for rev 1.403 (restored in rev 1.405)
-
-Revision 1.406.2.15  2005/03/11 19:52:06  pluto
-- ugly hack for partially broken gcc4 (thx. Dirk Mueller).
-
-Revision 1.406.2.14  2005/03/11 17:09:55  pluto
-- BR: sed.
-
-Revision 1.406.2.13  2005/03/06 16:46:15  wolf
-- altered some descriptions
-
-Revision 1.406.2.12  2005/03/06 16:23:10  wolf
-- rel 0.2
-- remove kwin shadow patch - kde has native support for composite
-- add knetattach documentation
-
-Revision 1.406.2.11  2005/03/05 22:50:50  arekm
-- more BR, some new files
-
-Revision 1.406.2.10  2005/03/05 14:59:59  arekm
-- up to 3.4.0
-
-Revision 1.406.2.9  2005/02/24 08:05:39  adgor
-- No unsermake BR at this moment
-
-Revision 1.406.2.8  2005/02/20 12:03:54  adgor
-- 3.3.92.050217
-
-Revision 1.406.2.7  2005/02/15 03:12:12  adgor
-- Aplied prefmenu & kdm_utmpx patches
-
-Revision 1.406.2.6  2005/02/11 16:23:46  adgor
-- Updated to 050210 snap because kdebase-3.3.92 does not build
-
-Revision 1.406.2.5  2005/01/23 17:09:18  adgor
-- Changed bogus 'X-administration' category to 'SystemSetup'
-  for konquerorsu & konsolesu
-
-Revision 1.406.2.4  2005/01/23 16:21:08  adgor
-- krandrtray is an applet
-
-Revision 1.406.2.3  2005/01/20 21:57:38  adgor
-- No unsermake
-- Cleanups, simplifications
-
-Revision 1.406.2.2  2005/01/14 18:12:38  wolf
-- 3.3.91
-
-Revision 1.412  2005/01/09 23:29:30  paszczus
-- added R: pciutils (lspci needed in infocenter)
-
-Revision 1.411  2005/01/08 19:48:09  sparky
-- O: entrance
-
-Revision 1.410  2004/12/14 23:49:50  havner
-- patch21 already in branch diff
-
-Revision 1.409  2004/12/14 23:20:35  havner
-- post 3.3.2 branch diff
-
-Revision 1.408  2004/12/12 23:10:01  ankry
-- 3.3.2; thanks to Michal Kochanowicz
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.491&r2=1.492&f=u



More information about the pld-cvs-commit mailing list