diff options
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec | 42 | ||||
| -rw-r--r-- | redhat/tdeaddons/tdeaddons-14.0.0.spec | 33 | ||||
| -rw-r--r-- | redhat/tdeadmin/tdeadmin-14.0.0.spec | 51 | ||||
| -rw-r--r-- | redhat/tdeartwork/tdeartwork-14.0.0.spec | 12 | ||||
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0.spec | 6 | ||||
| -rw-r--r-- | redhat/tdebindings/tdebindings-14.0.0.spec | 21 | ||||
| -rw-r--r-- | redhat/tdeedu/tdeedu-14.0.0.spec | 55 | ||||
| -rw-r--r-- | redhat/tdegames/tdegames-14.0.0.spec | 46 | ||||
| -rw-r--r-- | redhat/tdegraphics/tdegraphics-14.0.0.spec | 7 | ||||
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 6 | ||||
| -rw-r--r-- | redhat/tdemultimedia/tdemultimedia-14.0.0.spec | 1 | ||||
| -rw-r--r-- | redhat/tdenetwork/tdenetwork-14.0.0.spec | 14 | ||||
| -rw-r--r-- | redhat/tdepim/tdepim-14.0.0.spec | 38 | ||||
| -rw-r--r-- | redhat/tdesdk/tdesdk-14.0.0.spec | 17 | ||||
| -rw-r--r-- | redhat/tdetoys/tdetoys-14.0.0.spec | 8 | ||||
| -rw-r--r-- | redhat/tdeutils/tdeutils-14.0.0.spec | 12 | ||||
| -rw-r--r-- | redhat/tdevelop/tdevelop-14.0.0.spec | 33 | ||||
| -rw-r--r-- | redhat/tdewebdev/tdewebdev-14.0.0.spec | 32 |
18 files changed, 233 insertions, 201 deletions
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec index 90e3cf0ab..fd8352cb1 100644 --- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec +++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 14.0.0 + # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -18,29 +20,29 @@ %define _docdir %{tde_docdir} -Summary: Trinity Desktop Environment - Accessibility -Name: trinity-tdeaccessibility -Version: 14.0.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Summary: Trinity Desktop Environment - Accessibility +Name: trinity-tdeaccessibility +Version: %{tde_version} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -License: GPLv2 -Group: User Interface/Desktops +License: GPLv2 +Group: User Interface/Desktops -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ -Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake libtool m4 BuildRequires: desktop-file-utils BuildRequires: trinity-akode-devel -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdemultimedia-devel >= %{version} +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} BuildRequires: alsa-lib-devel @@ -467,11 +469,15 @@ fi --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ --enable-new-ldflags \ - --enable-closure \ - --disable-debug --disable-warnings \ --enable-final \ + --enable-closure \ + --disable-rpath \ + --enable-gcc-hidden-visibility \ + \ --enable-ksayit-audio-plugins \ --with-akode diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index 9df9e7a63..fe3ccfa32 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 14.0.0 + # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -19,7 +21,7 @@ Name: trinity-tdeaddons Summary: Trinity Desktop Environment - Plugins -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -40,14 +42,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-tqt3-devel >= 3.3.8d -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdebase-devel >= %{version} -BuildRequires: trinity-tdegames-devel >= %{version} -BuildRequires: trinity-tdemultimedia-devel >= %{version} -BuildRequires: trinity-tdepim-devel >= %{version} -BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: trinity-tqt3-devel >= 3.5.0 +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdebase-devel >= %{tde_version} +BuildRequires: trinity-tdegames-devel >= %{tde_version} +BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} +BuildRequires: trinity-tdepim-devel >= %{tde_version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: SDL-devel BuildRequires: alsa-lib-devel @@ -73,8 +75,6 @@ BuildRequires: libdb-4_8-devel #BuildRequires: xmms-devel #%endif -#Requires: which - Requires: trinity-atlantikdesigner = %{version}-%{release} Requires: trinity-kaddressbook-plugins = %{version}-%{release} Requires: trinity-kate-plugins = %{version}-%{release} @@ -700,12 +700,17 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ --enable-new-ldflags \ + --enable-final \ --enable-closure \ - --disable-debug --disable-warnings \ - --disable-dependency-tracking --enable-final \ + --disable-rpath \ + --enable-gcc-hidden-visibility \ + \ --with-extra-includes=%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts \ + \ %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \ --with-sdl \ %if 0%{?with_db4} diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec index 6dd536065..2059e2000 100644 --- a/redhat/tdeadmin/tdeadmin-14.0.0.spec +++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec @@ -3,7 +3,9 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +%define tde_version 14.0.0 + +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_sbindir %{tde_prefix}/sbin %define tde_datadir %{tde_prefix}/share @@ -21,7 +23,7 @@ Name: trinity-tdeadmin Summary: Administrative tools for TDE -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -45,9 +47,9 @@ Source6: ksysvrc Source7: kuserrc BuildRequires: autoconf automake libtool m4 -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: rpm-devel BuildRequires: pam-devel %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -391,23 +393,28 @@ if [ -d /usr/X11R6 ]; then fi %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --sbindir=%{tde_sbindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-rpath \ - --with-rpm \ - --with-pam=kde \ - --with-shadow \ - --with-private-groups \ - --enable-final \ - --enable-closure \ - --with-private-groups + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --sbindir=%{tde_sbindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --disable-rpath \ + --enable-gcc-hidden-visibility \ + \ + --with-extra-includes=%{tde_includedir}/tqt \ + \ + --with-rpm \ + --with-pam=kde \ + --with-shadow \ + --with-private-groups %__make %{?_smp_mflags} diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec index 62d57b486..372dab414 100644 --- a/redhat/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec @@ -22,7 +22,7 @@ Name: trinity-tdeartwork Summary: Additional artwork (themes, sound themes, ...) for TDE -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -239,8 +239,8 @@ This package is part of Trinity, and a component of the TDE artwork module. %files theme-window %defattr(-,root,root,-) -%{tde_tdelibdir}/[kt]win* -%{tde_datadir}/apps/[kt]win/ +%{tde_tdelibdir}/twin* +%{tde_datadir}/apps/twin/ ########## @@ -678,9 +678,9 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index f661ce78f..70b7ba2ce 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -3296,9 +3296,9 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec index 62499b50d..54691f33d 100644 --- a/redhat/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/tdebindings/tdebindings-14.0.0.spec @@ -36,7 +36,7 @@ Source91: filter-requires.sh Name: trinity-tdebindings Summary: TDE bindings to non-C++ languages -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -1018,6 +1018,7 @@ if [ -d /usr/evolution28 ]; then export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" fi +# Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -1027,17 +1028,21 @@ fi --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ - --disable-rpath \ - --enable-new-ldflags \ - --disable-debug --disable-warnings \ + \ --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --disable-rpath \ + --disable-gcc-hidden-visibility \ + \ + --with-extra-includes=%{_includedir}/tqscintilla \ --with-extra-libs=%{tde_libdir} \ --with-pythondir=%{_usr} \ - --enable-closure \ - --enable-final \ + \ %{?_with_java} %{!?_with_java:--without-java} \ - %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \ - --with-extra-includes=%{_includedir}/tqscintilla + %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} # Build dcopperl with specific options pushd dcopperl diff --git a/redhat/tdeedu/tdeedu-14.0.0.spec b/redhat/tdeedu/tdeedu-14.0.0.spec index 1a8cd2a5b..dedbed5b1 100644 --- a/redhat/tdeedu/tdeedu-14.0.0.spec +++ b/redhat/tdeedu/tdeedu-14.0.0.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 14.0.0 + # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -19,7 +21,7 @@ Name: trinity-tdeedu Summary: Educational/Edutainment applications -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -36,7 +38,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: autoconf automake libtool m4 BuildRequires: desktop-file-utils -BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: python-devel python BuildRequires: boost-devel %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 @@ -1110,9 +1112,9 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-libtdeedu3 %defattr(-,root,root,-) %{tde_libdir}/libextdate.so.* -%{tde_libdir}/lib[kt]deeducore.so.* -%{tde_libdir}/lib[kt]deeduplot.so.* -%{tde_libdir}/lib[kt]deeduui.so.* +%{tde_libdir}/libtdeeducore.so.* +%{tde_libdir}/libtdeeduplot.so.* +%{tde_libdir}/libtdeeduui.so.* %post -n trinity-libtdeedu3 /sbin/ldconfig || : @@ -1138,15 +1140,15 @@ This package is part of Trinity, as a component of the TDE education module. %files -n trinity-libtdeedu-devel %defattr(-,root,root,-) -%{tde_tdeincludedir}/lib[kt]deedu/ +%{tde_tdeincludedir}/libtdeedu/ %{tde_libdir}/libextdate.la %{tde_libdir}/libextdate.so -%{tde_libdir}/lib[kt]deeducore.la -%{tde_libdir}/lib[kt]deeducore.so -%{tde_libdir}/lib[kt]deeduui.la -%{tde_libdir}/lib[kt]deeduui.so -%{tde_libdir}/lib[kt]deeduplot.la -%{tde_libdir}/lib[kt]deeduplot.so +%{tde_libdir}/libtdeeducore.la +%{tde_libdir}/libtdeeducore.so +%{tde_libdir}/libtdeeduui.la +%{tde_libdir}/libtdeeduui.so +%{tde_libdir}/libtdeeduplot.la +%{tde_libdir}/libtdeeduplot.so %post -n trinity-libtdeedu-devel /sbin/ldconfig || : @@ -1327,25 +1329,28 @@ if [ -d "/usr/X11R6" ]; then export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +# Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-rpath \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --disable-rpath \ + --disable-gcc-hidden-visibility \ + \ %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} --enable-kig-python-scripting \ %else --disable-kig-python-scripting \ %endif - --disable-debug \ - --disable-warnings \ - --enable-final \ - --enable-closure \ --enable-ocamlsolver %__make %{_smp_mflags} \ diff --git a/redhat/tdegames/tdegames-14.0.0.spec b/redhat/tdegames/tdegames-14.0.0.spec index 91fa130ad..35dbd988b 100644 --- a/redhat/tdegames/tdegames-14.0.0.spec +++ b/redhat/tdegames/tdegames-14.0.0.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 14.0.0 + # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -20,7 +22,7 @@ Name: trinity-tdegames Summary: Trinity Desktop Environment - Games -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -38,11 +40,11 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: autoconf automake libtool m4 BuildRequires: libtool -BuildRequires: tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdemultimedia-devel >= %{version} -BuildRequires: trinity-tqt3-devel +BuildRequires: tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdemultimedia-devel >= %{tde_version} +BuildRequires: trinity-tqt3-devel >= 3.5.0 Obsoletes: trinity-kdegames < %{version}-%{release} Provides: trinity-kdegames = %{version}-%{release} @@ -101,7 +103,7 @@ Group: Development/Libraries License: LGPLv2 Requires: %{name} = %{version}-%{release} -Requires: trinity-tdelibs-devel >= 3.5.13 +Requires: trinity-tdelibs-devel >= %{tde_version} Requires: trinity-libtdegames-devel = %{version}-%{release} Requires: trinity-atlantik-devel = %{version}-%{release} Requires: trinity-kolf-devel = %{version}-%{release} @@ -1537,20 +1539,22 @@ if [ -d "/usr/X11R6" ]; then fi %configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-rpath \ - --enable-final \ - --disable-debug \ - --disable-warnings \ - --enable-closure \ - --disable-setgid + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + \ + --disable-dependency-tracking \ + --disable-debug \ + --enable-new-ldflags \ + --enable-final \ + --enable-closure \ + --disable-rpath \ + --enable-gcc-hidden-visibility \ + \ + --disable-setgid # WTF hack for RHEL4 %if 0%{?rhel} == 4 diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec index f41000f76..cac2f7085 100644 --- a/redhat/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec @@ -1261,10 +1261,11 @@ fi cd build %endif +# Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 3a0d2891c..d72dfcdf6 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -456,9 +456,9 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec index a00208f9e..8a95f9f8a 100644 --- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec @@ -1159,6 +1159,7 @@ if [ -d "/usr/X11R6" ]; then export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +# Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index d447c51d3..fd39b982f 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -66,16 +66,18 @@ Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch BuildRequires: cmake >= 2.8 BuildRequires: gettext -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: coreutils BuildRequires: openssl-devel +BuildRequires: gnutls-devel + +# SQLITE support %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: sqlite3-devel %else BuildRequires: sqlite-devel %endif -BuildRequires: gnutls-devel # GADU support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} @@ -1096,9 +1098,9 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec index b7dee3de5..faa41871c 100644 --- a/redhat/tdepim/tdepim-14.0.0.spec +++ b/redhat/tdepim/tdepim-14.0.0.spec @@ -48,9 +48,9 @@ Patch14: kdepim-3.5.13-missing_ldflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-libcaldav-devel BuildRequires: trinity-libcarddav-devel @@ -62,7 +62,8 @@ BuildRequires: libical-devel BuildRequires: boost-devel BuildRequires: pcre-devel BuildRequires: glib2-devel -BuildRequires: gcc-c++ make +BuildRequires: gcc-c++ +BuildRequires: make BuildRequires: libidn-devel # CURL support @@ -1682,14 +1683,14 @@ This is the runtime package for programs that use the trinity-libtdepim library. %files -n trinity-libtdepim %defattr(-,root,root,-) -%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.la -%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.so +%{tde_tdelibdir}/plugins/designer/tdepimwidgets.la +%{tde_tdelibdir}/plugins/designer/tdepimwidgets.so %{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.la %{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.so -%{tde_libdir}/lib[kt]depim.so.* -%{tde_datadir}/apps/[kt]depimwidgets -%{tde_datadir}/apps/lib[kt]depim -%{tde_datadir}/apps/[kt]depim +%{tde_libdir}/libtdepim.so.* +%{tde_datadir}/apps/tdepimwidgets +%{tde_datadir}/apps/libtdepim +%{tde_datadir}/apps/tdepim %{tde_datadir}/config.kcfg/pimemoticons.kcfg %{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png %{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png @@ -1725,9 +1726,9 @@ library. %files -n trinity-libtdepim-devel %defattr(-,root,root,-) -%{tde_tdeincludedir}/[kt]depimmacros.h -%{tde_libdir}/lib[kt]depim.la -%{tde_libdir}/lib[kt]depim.so +%{tde_tdeincludedir}/tdepimmacros.h +%{tde_libdir}/libtdepim.la +%{tde_libdir}/libtdepim.so %post -n trinity-libtdepim-devel /sbin/ldconfig || : @@ -1933,8 +1934,8 @@ libkpimexchange-trinity library. %files -n trinity-libkpimexchange-devel %defattr(-,root,root,-) -%{tde_tdeincludedir}/[kt]depim/exchangeaccount.h -%{tde_tdeincludedir}/[kt]depim/exchangeclient.h +%{tde_tdeincludedir}/tdepim/exchangeaccount.h +%{tde_tdeincludedir}/tdepim/exchangeclient.h %{tde_libdir}/libkpimexchange.la %{tde_libdir}/libkpimexchange.so @@ -2206,10 +2207,11 @@ fi cd build %endif +# Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=OFF \ diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec index 36984d4f3..3c71899a2 100644 --- a/redhat/tdesdk/tdesdk-14.0.0.spec +++ b/redhat/tdesdk/tdesdk-14.0.0.spec @@ -1086,9 +1086,9 @@ cd build %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ @@ -1115,17 +1115,6 @@ export PATH="%{tde_bindir}:${PATH}" %__make install DESTDIR=%{?buildroot} -C build -# make symlinks relative -if [ -d %{buildroot}%{tde_tdedocdir}/HTML/en ]; then - pushd %{buildroot}%{tde_tdedocdir}/HTML/en - for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -nfs ../common $i - fi - done - popd -fi # Installs kdepalettes %__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes diff --git a/redhat/tdetoys/tdetoys-14.0.0.spec b/redhat/tdetoys/tdetoys-14.0.0.spec index 9da294908..d3b924ace 100644 --- a/redhat/tdetoys/tdetoys-14.0.0.spec +++ b/redhat/tdetoys/tdetoys-14.0.0.spec @@ -23,7 +23,7 @@ Summary: Trinity Desktop Environment - Toys and Amusements Name: trinity-tdetoys Group: Amusements/Graphics -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ @@ -392,9 +392,9 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec index b8a6f1d86..a67431c26 100644 --- a/redhat/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/tdeutils/tdeutils-14.0.0.spec @@ -48,9 +48,9 @@ Provides: trinity-kdeutils-extras = %{version}-%{release} Obsoletes: tdeutils < %{version}-%{release} Provides: tdeutils = %{version}-%{release} -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: autoconf automake libtool m4 BuildRequires: gettext BuildRequires: net-snmp-devel @@ -997,9 +997,9 @@ cd build %endif %cmake \ - -DCMAKE_BUILD_TYPE="" \ - -DCMAKE_C_FLAGS="-DNDEBUG" \ - -DCMAKE_CXX_FLAGS="-DNDEBUG" \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_GCC_VISIBILITY=ON \ diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec index 8ff3f2478..446248fa0 100644 --- a/redhat/tdevelop/tdevelop-14.0.0.spec +++ b/redhat/tdevelop/tdevelop-14.0.0.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 14.0.0 + # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -19,7 +21,7 @@ Name: trinity-tdevelop Summary: Integrated Development Environment for C++/C -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2 @@ -47,16 +49,16 @@ Requires: %{name}-libs = %{version}-%{release} Requires: make Requires: perl Requires: flex >= 2.5.4 -Requires: trinity-tqt3-designer -Requires: trinity-tqt3-devel +Requires: trinity-tqt3-designer >= 3.5.0 +Requires: trinity-tqt3-devel >= 3.5.0 Requires: gettext Requires: ctags BuildRequires: cmake >= 2.8 -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-arts-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdesdk-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} +BuildRequires: trinity-arts-devel >= %{tde_version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdesdk-devel >= %{tde_version} %if 0%{?rhel} || 0%{?fedora} BuildRequires: db4-devel %endif @@ -65,14 +67,17 @@ BuildRequires: flex # Requires kdesdk3. BuildRequires: subversion-devel BuildRequires: neon-devel -# looks like this is dragged in by apr-devel (dep of subversion-devel), but not -# a dependency + +# LDAP support %if 0%{?suse_version} BuildRequires: openldap2-devel %else BuildRequires: openldap-devel %endif +#ACL support +BuildRequires: libacl-devel + Obsoletes: trinity-tdevelop < %{version}-%{release} Provides: trinity-tdevelop = %{version}-%{release} @@ -594,12 +599,20 @@ popd cd build %endif +# Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ + \ -DBIN_INSTALL_DIR=%{tde_bindir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DCMAKE_SKIP_RPATH="OFF" \ + \ -DWITH_BUILDTOOL_ALL=ON \ -DWITH_LANGUAGE_ALL=ON \ -DWITH_VCS_ALL=OFF \ diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec index 5176af625..07e5d85c2 100644 --- a/redhat/tdewebdev/tdewebdev-14.0.0.spec +++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec @@ -3,6 +3,8 @@ %define _variant .opt %endif +%define tde_version 14.0.0 + # TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share @@ -19,7 +21,7 @@ %define _docdir %{tde_docdir} Name: trinity-tdewebdev -Version: 14.0.0 +Version: %{tde_version} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Web development applications @@ -43,8 +45,8 @@ Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch BuildRequires: autoconf automake libtool m4 BuildRequires: desktop-file-utils -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: trinity-tdesdk-devel >= %{version} +BuildRequires: trinity-tdelibs-devel >= %{tde_version} +BuildRequires: trinity-tdesdk-devel >= %{tde_version} BuildRequires: libxslt-devel BuildRequires: libxml2-devel %if 0%{?rhel} == 4 @@ -502,14 +504,12 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -# Do not build against any "/usr" installed KDE -export KDEDIR="%{tde_prefix}" - # Specific path for RHEL4 if [ -d "/usr/X11R6" ]; then export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi +# Warning: GCC visibility causes FTBFS [Bug #1285] %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -517,11 +517,14 @@ fi --datadir=%{tde_datadir} \ --libdir=%{tde_libdir} \ --includedir=%{tde_tdeincludedir} \ - --disable-rpath \ + \ + --disable-dependency-tracking \ + --disable-debug \ --enable-new-ldflags \ + --enable-final \ --enable-closure \ - --disable-debug --disable-warnings \ - --disable-dependancy-tracking --enable-final + --disable-rpath \ + --disable-gcc-hidden-visibility # WTF hack for RHEL4 %if 0%{?rhel} == 4 @@ -550,17 +553,6 @@ EOF done cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/ -# make symlinks relative -pushd %{buildroot}%{tde_tdedocdir}/HTML/en -for i in *; do - if [ -d $i -a -L $i/common ]; then - rm -f $i/common - ln -nfs ../common $i - fi -done -popd - - %clean %__rm -rf %{buildroot} |