Author: adgor Date: Thu Dec 8 19:09:57 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- hidden_visibility bcond
---- Files affected:
SPECS:
kdemultimedia.spec (1.205 -> 1.206) , kdepim.spec (1.205 -> 1.206)
---- Diffs:
================================================================
Index: SPECS/kdemultimedia.spec
diff -u SPECS/kdemultimedia.spec:1.205 SPECS/kdemultimedia.spec:1.206
--- SPECS/kdemultimedia.spec:1.205 Sat Nov 26 15:12:41 2005
+++ SPECS/kdemultimedia.spec Thu Dec 8 20:09:52 2005
@@ -6,7 +6,10 @@
# Conditional build:
%bcond_without alsa # build without ALSA support
%bcond_without xine # build without xine support
-%bcond_with gstreamer # build with gstreamer support
+%bcond_with gstreamer # build with gstreamer support
+%bcond_with hidden_visibility # pass '--fvisibility=hidden'
+ # & '--fvisibility-inlines-hidden'
+ # to g++
#
%define _state stable
%define _kdever 3.5
@@ -38,6 +41,7 @@
BuildRequires: automake
BuildRequires: cdparanoia-III-devel
BuildRequires: flac-devel >= 1.1.2
+%{?with_hidden_visibility:BuildRequires: gcc-c++ >=
5:4.1.0-0.20051206r108118.1}
BuildRequires: gettext-devel
%if %{with gstreamer}
BuildRequires: gstreamer-devel >= 0.8
@@ -57,6 +61,7 @@
BuildRequires: libvorbis-devel
BuildRequires: pkgconfig
BuildRequires: polypaudio-devel
+%{?with_hidden_visibility:BuildRequires: qt-devel >= 6:3.3.5.051113-1}
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: rpmbuild(macros) >= 1.129
BuildRequires: speex-devel
@@ -580,15 +585,17 @@
export CDPARANOIA=%{_bindir}/cdparanoia
%configure \
+ --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
+ %{!?debug:--disable-rpath} \
--enable-final \
- --disable-rpath \
- --with%{?without_alsa:out}-arts-alsa \
- --with-extra-includes=%{_includedir}/speex \
- --with-qt-libraries=%{_libdir} \
+ %{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
%if "%{_lib}" == "lib64"
--enable-libsuffix=64 \
%endif
- --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full}
+ --with%{?without_alsa:out}-arts-alsa \
+ --with-extra-includes=%{_includedir}/speex \
+ --with-qt-libraries=%{_libdir} \
+ --with-distribution="PLD Linux Distribution"
%{__make}
@@ -971,6 +978,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.206 2005/12/08 19:09:52 adgor
+- hidden_visibility bcond
+
Revision 1.205 2005/11/26 14:12:41 arekm
- rel 3; new tarball
================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.205 SPECS/kdepim.spec:1.206
--- SPECS/kdepim.spec:1.205 Tue Dec 6 21:55:31 2005
+++ SPECS/kdepim.spec Thu Dec 8 20:09:52 2005
@@ -1,6 +1,9 @@
# $Revision$, $Date$
# Conditional build:
%bcond_without apidocs # do not prepare API documentation
+%bcond_with hidden_visibility # pass '--fvisibility=hidden'
+ # & '--fvisibility-inlines-hidden'
+ # to g++
#
%define _state stable
%define _kdever 3.5
@@ -35,6 +38,7 @@
%{?with_apidocs:BuildRequires: doxygen}
BuildRequires: ed
BuildRequires: flex
+%{?with_hidden_visibility:BuildRequires: gcc-c++ >=
5:4.1.0-0.20051206r108118.1}
BuildRequires: gpgme-devel >= 1:1.0.0
BuildRequires: gnupg-agent
%{?with_apidocs:BuildRequires: graphviz}
@@ -45,6 +49,7 @@
BuildRequires: openssl-devel
BuildRequires: pcre-devel
BuildRequires: pilot-link-devel
+%{?with_hidden_visibility:BuildRequires: qt-devel >= 6:3.3.5.051113-1}
BuildRequires: qt-designer-libs
%{?with_apidocs:BuildRequires: qt-doc}
BuildRequires: rpmbuild(macros) >= 1.129
@@ -538,18 +543,19 @@
%build
%configure \
+ --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
+ %{!?debug:--disable-rpath} \
%ifnarch alpha
--enable-final \
%endif
- --disable-rpath \
- --with-distribution="PLD Linux Distribution" \
- --with-qt-libraries=%{_libdir} \
+ %{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
+ --enable-indexlib
%if "%{_lib}" == "lib64"
--enable-libsuffix=64 \
%endif
- --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
--enable-newdistrlists \
- --enable-indexlib
+ --with-distribution="PLD Linux Distribution" \
+ --with-qt-libraries=%{_libdir} \
%{__make}
@@ -1381,6 +1387,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.206 2005/12/08 19:09:52 adgor
+- hidden_visibility bcond
+
Revision 1.205 2005/12/06 20:55:31 glen
- remove checked files (according to r1.203)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdemultimedia.spec?r1=1.205&r2=1.206&f=u
http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.205&r2=1.206&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
