SPECS: kdelibs.spec, kdebase.spec - hidden_visibility bcond

adgor adgor at pld-linux.org
Thu Dec 8 12:53:10 CET 2005


Author: adgor                        Date: Thu Dec  8 11:53:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- hidden_visibility bcond

---- Files affected:
SPECS:
   kdelibs.spec (1.437 -> 1.438) , kdebase.spec (1.477 -> 1.478) 

---- Diffs:

================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.437 SPECS/kdelibs.spec:1.438
--- SPECS/kdelibs.spec:1.437	Wed Dec  7 00:43:23 2005
+++ SPECS/kdelibs.spec	Thu Dec  8 12:53:04 2005
@@ -6,6 +6,9 @@
 %bcond_without  autoreqdep	# don't care about package name deps generated by rpm
 %bcond_without	heimdal		# disable kerberos
 %bcond_with	verbose		# verbose build
+%bcond_with	hidden_visibility	# pass '--fvisibility=hidden'
+					# & '--fvisibility-inlines-hidden'
+					# to g++ 
 #
 %define		_state		stable
 %define		_kdever		3.5
@@ -62,6 +65,7 @@
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	ed
 BuildRequires:	fam-devel
+%{?with_hidden_visibility:BuildRequires:	gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
 BuildRequires:	gettext-devel
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	hspell-devel
@@ -86,6 +90,7 @@
 BuildRequires:	pcre-devel >= 3.5
 BuildRequires:	pkgconfig
 BuildRequires:	qt-devel >= 6:3.3.3-4
+%{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 %{?with_apidocs:BuildRequires:	qt-doc}
 #BuildRequires:	unsermake >= 040511
 BuildRequires:	rpmbuild(macros) >= 1.129
@@ -343,16 +348,15 @@
 export kde_htmldir=%{_kdedocdir}
 export kde_libs_htmldir=%{_kdedocdir}
 
-#export UNSERMAKE=%{_datadir}/unsermake/unsermake
-
-
 CPPFLAGS="-I$(pwd)/kdecore/network"
 %configure \
+	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
+	%{!?debug:--disable-rpath} \
+	--enable-final \
+	%{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
-	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-	%{!?debug:--disable-rpath} \
 	--enable-mitshm \
 	--with-ldap=no \
 	--with%{!?with_alsa:out}-alsa \
@@ -1000,6 +1004,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.438  2005/12/08 11:53:04  adgor
+- hidden_visibility bcond
+
 Revision 1.437  2005/12/06 23:43:23  glen
 - adapterized
 - apply branch diff

================================================================
Index: SPECS/kdebase.spec
diff -u SPECS/kdebase.spec:1.477 SPECS/kdebase.spec:1.478
--- SPECS/kdebase.spec:1.477	Wed Dec  7 01:45:28 2005
+++ SPECS/kdebase.spec	Thu Dec  8 12:53:04 2005
@@ -10,7 +10,10 @@
 %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'
+					# & '--fvisibility-inlines-hidden'
+					# to g++ 
+#
 %define		_state		stable
 %define		_kdever		3.5
 %define		_ver		3.5.0
@@ -82,6 +85,7 @@
 BuildRequires:	db-devel
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	ed
+%{?with_hidden_visibility:BuildRequires:	gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
 BuildRequires:	gettext-devel
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	grep
@@ -109,6 +113,7 @@
 %{?with_ldap:BuildRequires:	openldap-devel}
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
+%{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 %{?with_apidocs:BuildRequires:	qt-doc}
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	rpm-pythonprov
@@ -1136,17 +1141,14 @@
 	fi
 %endif
 
-
-#export UNSERMAKE=/usr/share/unsermake/unsermake
-
-
 %configure \
+	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
+	%{!?debug:--disable-rpath} \
 	--enable-final \
+	%{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
-	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-	--disable-rpath \
 	--without-java \
 	--with-kdm-pam=kdm \
 	--with-pam=kdesktop \
@@ -2860,6 +2862,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.437&r2=1.438&f=u
    http://cvs.pld-linux.org/SPECS/kdebase.spec?r1=1.477&r2=1.478&f=u




More information about the pld-cvs-commit mailing list