Hello community, here is the log from the commit of package libqca2 for openSUSE:Factory checked in at 2012-03-12 08:53:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqca2 (Old) and /work/SRC/openSUSE:Factory/.libqca2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqca2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes 2011-09-23 02:09:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes 2012-03-12 08:53:36.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Mar 11 00:06:55 UTC 2012 - [email protected] + +- Build respecting RPM_OPT_FLAGS, ugly hack to fix all + *.pro files ensued. +- Build with visibility-inlines-hidden + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqca2.spec ++++++ --- /var/tmp/diff_new_pack.brQQzn/_old 2012-03-12 08:53:37.000000000 +0100 +++ /var/tmp/diff_new_pack.brQQzn/_new 2012-03-12 08:53:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqca2 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libqca2 -BuildRequires: cmake libdrm-devel libjpeg-devel libqt4-devel openssl-devel -BuildRequires: kde4-filesystem update-desktop-files -BuildRequires: cyrus-sasl-devel gpg2 libgcrypt-devel +BuildRequires: cmake +BuildRequires: cyrus-sasl-devel +BuildRequires: gpg2 +BuildRequires: kde4-filesystem +BuildRequires: libdrm-devel +BuildRequires: libgcrypt-devel +BuildRequires: libjpeg-devel +BuildRequires: libqt4-devel +BuildRequires: openssl-devel +BuildRequires: update-desktop-files +Summary: Qt Cryptographic Architecture 2 License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Summary: Qt Cryptographic Architecture 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://delta.affinix.com/qca/ Version: 2.0.3 -Release: 1 +Release: 0 %define tar_version %{version} %define my_subdirs qca-gnupg-* qca-ossl-* qca-pkcs11-* qca-cyrus-sasl-* %define with_botan 0 @@ -71,7 +76,6 @@ Justin Karneges <[email protected]> %package devel -License: LGPL-2.1+ Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -89,7 +93,6 @@ Justin Karneges <[email protected]> %package plugin-cyrus-sasl -License: LGPL-2.1+ Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -112,7 +115,6 @@ %if %with_botan %package plugin-botan -License: LGPL-2.1+ Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -137,7 +139,6 @@ %if %with_nss %package plugin-nss -License: LGPL-2.1+ Summary: Qt Cryptographic Architecture 2 Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -161,7 +162,6 @@ %if %with_pkcs11 %package plugin-pkcs11 -License: LGPL-2.1+ Summary: Qt Cryptographic Architecture 2 - pkcs11 support Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -184,7 +184,7 @@ %endif %prep -%setup -c -n qca-%{tar_version}/plugins -a 1 -a 2 -a 3 -a 4 +%setup -q -c -n qca-%{tar_version}/plugins -a 1 -a 2 -a 3 -a 4 pushd qca-gnupg-* %patch0 popd @@ -196,6 +196,9 @@ %patch1 %build +# I confess this is ugly.. +# but there are too many "pro" files to make a patch ( > 180) +find -type f -name "*.pro" -exec sed -i "1i QMAKE_CXXFLAGS +=$RPM_OPT_FLAGS -fvisibility-inlines-hidden" {} + pushd plugins rm -rf CMakeLists.txt qca-%{version} for i in *; do @@ -204,7 +207,8 @@ popd export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS" -EXTRA_FLAGS="" +export EXTRA_FLAGS="$RPM_OPT_FLAGS -fvisibility-inlines-hidden" +export QMAKE_CXXFLAGS="$EXTRA_FLAGS" if [ %{_lib} = lib64 ]; then EXTRA_FLAGS="$EXTRA_FLAGS -DLIB_SUFFIX=64" fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
