RPM Packaging: update main packages

pull/3/head
François Andriot 11 years ago
parent 5b9c5354a7
commit 5ce995a0b7

@ -3,6 +3,8 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_version 14.0.0
# TDE specific building variables # TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
@ -20,7 +22,7 @@
Summary: Trinity Desktop Environment - Accessibility Summary: Trinity Desktop Environment - Accessibility
Name: trinity-tdeaccessibility Name: trinity-tdeaccessibility
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -38,9 +40,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: trinity-akode-devel BuildRequires: trinity-akode-devel
BuildRequires: trinity-arts-devel >= %{version} BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdemultimedia-devel >= %{version} BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
@ -467,11 +469,15 @@ fi
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \ --datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ --includedir=%{tde_tdeincludedir} \
--disable-rpath \ \
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \ --enable-new-ldflags \
--enable-closure \
--disable-debug --disable-warnings \
--enable-final \ --enable-final \
--enable-closure \
--disable-rpath \
--enable-gcc-hidden-visibility \
\
--enable-ksayit-audio-plugins \ --enable-ksayit-audio-plugins \
--with-akode --with-akode

@ -3,6 +3,8 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_version 14.0.0
# TDE specific building variables # TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
@ -19,7 +21,7 @@
Name: trinity-tdeaddons Name: trinity-tdeaddons
Summary: Trinity Desktop Environment - Plugins Summary: Trinity Desktop Environment - Plugins
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -40,14 +42,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-tqt3-devel >= 3.3.8d BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-arts-devel >= %{version} BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: trinity-tdegames-devel >= %{version} BuildRequires: trinity-tdegames-devel >= %{tde_version}
BuildRequires: trinity-tdemultimedia-devel >= %{version} BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
BuildRequires: trinity-tdepim-devel >= %{version} BuildRequires: trinity-tdepim-devel >= %{tde_version}
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: SDL-devel BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
@ -73,8 +75,6 @@ BuildRequires: libdb-4_8-devel
#BuildRequires: xmms-devel #BuildRequires: xmms-devel
#%endif #%endif
#Requires: which
Requires: trinity-atlantikdesigner = %{version}-%{release} Requires: trinity-atlantikdesigner = %{version}-%{release}
Requires: trinity-kaddressbook-plugins = %{version}-%{release} Requires: trinity-kaddressbook-plugins = %{version}-%{release}
Requires: trinity-kate-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} \ --libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \ --datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ --includedir=%{tde_tdeincludedir} \
--disable-rpath \ \
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \ --enable-new-ldflags \
--enable-final \
--enable-closure \ --enable-closure \
--disable-debug --disable-warnings \ --disable-rpath \
--disable-dependency-tracking --enable-final \ --enable-gcc-hidden-visibility \
\
--with-extra-includes=%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts \ --with-extra-includes=%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts \
\
%{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \ %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \
--with-sdl \ --with-sdl \
%if 0%{?with_db4} %if 0%{?with_db4}

@ -3,7 +3,9 @@
%define _variant .opt %define _variant .opt
%endif %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_bindir %{tde_prefix}/bin
%define tde_sbindir %{tde_prefix}/sbin %define tde_sbindir %{tde_prefix}/sbin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
@ -21,7 +23,7 @@
Name: trinity-tdeadmin Name: trinity-tdeadmin
Summary: Administrative tools for TDE Summary: Administrative tools for TDE
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -45,9 +47,9 @@ Source6: ksysvrc
Source7: kuserrc Source7: kuserrc
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{version} BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: rpm-devel BuildRequires: rpm-devel
BuildRequires: pam-devel BuildRequires: pam-devel
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@ -398,15 +400,20 @@ fi
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \ --datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ --includedir=%{tde_tdeincludedir} \
--enable-new-ldflags \ \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--disable-rpath \ --disable-rpath \
--enable-gcc-hidden-visibility \
\
--with-extra-includes=%{tde_includedir}/tqt \
\
--with-rpm \ --with-rpm \
--with-pam=kde \ --with-pam=kde \
--with-shadow \ --with-shadow \
--with-private-groups \
--enable-final \
--enable-closure \
--with-private-groups --with-private-groups
%__make %{?_smp_mflags} %__make %{?_smp_mflags}

@ -22,7 +22,7 @@
Name: trinity-tdeartwork Name: trinity-tdeartwork
Summary: Additional artwork (themes, sound themes, ...) for TDE Summary: Additional artwork (themes, sound themes, ...) for TDE
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -239,8 +239,8 @@ This package is part of Trinity, and a component of the TDE artwork module.
%files theme-window %files theme-window
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_tdelibdir}/[kt]win* %{tde_tdelibdir}/twin*
%{tde_datadir}/apps/[kt]win/ %{tde_datadir}/apps/twin/
########## ##########
@ -678,9 +678,9 @@ cd build
%endif %endif
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \

@ -3296,9 +3296,9 @@ cd build
%endif %endif
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \

@ -36,7 +36,7 @@ Source91: filter-requires.sh
Name: trinity-tdebindings Name: trinity-tdebindings
Summary: TDE bindings to non-C++ languages Summary: TDE bindings to non-C++ languages
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -1018,6 +1018,7 @@ if [ -d /usr/evolution28 ]; then
export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
fi fi
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \ %configure \
--prefix=%{tde_prefix} \ --prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \
@ -1027,17 +1028,21 @@ fi
--includedir=%{tde_tdeincludedir} \ --includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \ --mandir=%{tde_mandir} \
--disable-rpath \ \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking \ --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-extra-libs=%{tde_libdir} \
--with-pythondir=%{_usr} \ --with-pythondir=%{_usr} \
--enable-closure \ \
--enable-final \
%{?_with_java} %{!?_with_java:--without-java} \ %{?_with_java} %{!?_with_java:--without-java} \
%{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \ %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla}
--with-extra-includes=%{_includedir}/tqscintilla
# Build dcopperl with specific options # Build dcopperl with specific options
pushd dcopperl pushd dcopperl

@ -3,6 +3,8 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_version 14.0.0
# TDE specific building variables # TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
@ -19,7 +21,7 @@
Name: trinity-tdeedu Name: trinity-tdeedu
Summary: Educational/Edutainment applications Summary: Educational/Edutainment applications
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -36,7 +38,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: python-devel python BuildRequires: python-devel python
BuildRequires: boost-devel BuildRequires: boost-devel
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 %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 %files -n trinity-libtdeedu3
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_libdir}/libextdate.so.* %{tde_libdir}/libextdate.so.*
%{tde_libdir}/lib[kt]deeducore.so.* %{tde_libdir}/libtdeeducore.so.*
%{tde_libdir}/lib[kt]deeduplot.so.* %{tde_libdir}/libtdeeduplot.so.*
%{tde_libdir}/lib[kt]deeduui.so.* %{tde_libdir}/libtdeeduui.so.*
%post -n trinity-libtdeedu3 %post -n trinity-libtdeedu3
/sbin/ldconfig || : /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 %files -n trinity-libtdeedu-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_tdeincludedir}/lib[kt]deedu/ %{tde_tdeincludedir}/libtdeedu/
%{tde_libdir}/libextdate.la %{tde_libdir}/libextdate.la
%{tde_libdir}/libextdate.so %{tde_libdir}/libextdate.so
%{tde_libdir}/lib[kt]deeducore.la %{tde_libdir}/libtdeeducore.la
%{tde_libdir}/lib[kt]deeducore.so %{tde_libdir}/libtdeeducore.so
%{tde_libdir}/lib[kt]deeduui.la %{tde_libdir}/libtdeeduui.la
%{tde_libdir}/lib[kt]deeduui.so %{tde_libdir}/libtdeeduui.so
%{tde_libdir}/lib[kt]deeduplot.la %{tde_libdir}/libtdeeduplot.la
%{tde_libdir}/lib[kt]deeduplot.so %{tde_libdir}/libtdeeduplot.so
%post -n trinity-libtdeedu-devel %post -n trinity-libtdeedu-devel
/sbin/ldconfig || : /sbin/ldconfig || :
@ -1327,6 +1329,7 @@ if [ -d "/usr/X11R6" ]; then
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \ %configure \
--prefix=%{tde_prefix} \ --prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \
@ -1334,18 +1337,20 @@ fi
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \ --datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ --includedir=%{tde_tdeincludedir} \
--enable-new-ldflags \ \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--disable-rpath \ --disable-rpath \
--disable-gcc-hidden-visibility \
\
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
--enable-kig-python-scripting \ --enable-kig-python-scripting \
%else %else
--disable-kig-python-scripting \ --disable-kig-python-scripting \
%endif %endif
--disable-debug \
--disable-warnings \
--enable-final \
--enable-closure \
--enable-ocamlsolver --enable-ocamlsolver
%__make %{_smp_mflags} \ %__make %{_smp_mflags} \

@ -3,6 +3,8 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_version 14.0.0
# TDE specific building variables # TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
@ -20,7 +22,7 @@
Name: trinity-tdegames Name: trinity-tdegames
Summary: Trinity Desktop Environment - Games Summary: Trinity Desktop Environment - Games
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -38,11 +40,11 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: libtool BuildRequires: libtool
BuildRequires: tqtinterface-devel >= %{version} BuildRequires: tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{version} BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdemultimedia-devel >= %{version} BuildRequires: trinity-tdemultimedia-devel >= %{tde_version}
BuildRequires: trinity-tqt3-devel BuildRequires: trinity-tqt3-devel >= 3.5.0
Obsoletes: trinity-kdegames < %{version}-%{release} Obsoletes: trinity-kdegames < %{version}-%{release}
Provides: trinity-kdegames = %{version}-%{release} Provides: trinity-kdegames = %{version}-%{release}
@ -101,7 +103,7 @@ Group: Development/Libraries
License: LGPLv2 License: LGPLv2
Requires: %{name} = %{version}-%{release} 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-libtdegames-devel = %{version}-%{release}
Requires: trinity-atlantik-devel = %{version}-%{release} Requires: trinity-atlantik-devel = %{version}-%{release}
Requires: trinity-kolf-devel = %{version}-%{release} Requires: trinity-kolf-devel = %{version}-%{release}
@ -1543,13 +1545,15 @@ fi
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \ --datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ --includedir=%{tde_tdeincludedir} \
--enable-new-ldflags \ \
--disable-dependency-tracking \ --disable-dependency-tracking \
--disable-rpath \
--enable-final \
--disable-debug \ --disable-debug \
--disable-warnings \ --enable-new-ldflags \
--enable-final \
--enable-closure \ --enable-closure \
--disable-rpath \
--enable-gcc-hidden-visibility \
\
--disable-setgid --disable-setgid
# WTF hack for RHEL4 # WTF hack for RHEL4

@ -1261,10 +1261,11 @@ fi
cd build cd build
%endif %endif
# Warning: GCC visibility causes FTBFS [Bug #1285]
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \ -DWITH_GCC_VISIBILITY=OFF \

@ -456,9 +456,9 @@ cd build
%endif %endif
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \

@ -1159,6 +1159,7 @@ if [ -d "/usr/X11R6" ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \ %configure \
--prefix=%{tde_prefix} \ --prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \

@ -66,16 +66,18 @@ Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: gettext BuildRequires: gettext
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: gnutls-devel
# SQLITE support
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: sqlite3-devel BuildRequires: sqlite3-devel
%else %else
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
%endif %endif
BuildRequires: gnutls-devel
# GADU support # GADU support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@ -1096,9 +1098,9 @@ cd build
%endif %endif
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \

@ -48,9 +48,9 @@ Patch14: kdepim-3.5.13-missing_ldflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{version} BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-libcaldav-devel BuildRequires: trinity-libcaldav-devel
BuildRequires: trinity-libcarddav-devel BuildRequires: trinity-libcarddav-devel
@ -62,7 +62,8 @@ BuildRequires: libical-devel
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gcc-c++ make BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: libidn-devel BuildRequires: libidn-devel
# CURL support # CURL support
@ -1682,14 +1683,14 @@ This is the runtime package for programs that use the trinity-libtdepim library.
%files -n trinity-libtdepim %files -n trinity-libtdepim
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.la %{tde_tdelibdir}/plugins/designer/tdepimwidgets.la
%{tde_tdelibdir}/plugins/designer/[kt]depimwidgets.so %{tde_tdelibdir}/plugins/designer/tdepimwidgets.so
%{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.la %{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.la
%{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.so %{tde_tdelibdir}/plugins/designer/tdepartsdesignerplugin.so
%{tde_libdir}/lib[kt]depim.so.* %{tde_libdir}/libtdepim.so.*
%{tde_datadir}/apps/[kt]depimwidgets %{tde_datadir}/apps/tdepimwidgets
%{tde_datadir}/apps/lib[kt]depim %{tde_datadir}/apps/libtdepim
%{tde_datadir}/apps/[kt]depim %{tde_datadir}/apps/tdepim
%{tde_datadir}/config.kcfg/pimemoticons.kcfg %{tde_datadir}/config.kcfg/pimemoticons.kcfg
%{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png %{tde_datadir}/icons/crystalsvg/22x22/actions/button_fewer.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png %{tde_datadir}/icons/crystalsvg/22x22/actions/button_more.png
@ -1725,9 +1726,9 @@ library.
%files -n trinity-libtdepim-devel %files -n trinity-libtdepim-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_tdeincludedir}/[kt]depimmacros.h %{tde_tdeincludedir}/tdepimmacros.h
%{tde_libdir}/lib[kt]depim.la %{tde_libdir}/libtdepim.la
%{tde_libdir}/lib[kt]depim.so %{tde_libdir}/libtdepim.so
%post -n trinity-libtdepim-devel %post -n trinity-libtdepim-devel
/sbin/ldconfig || : /sbin/ldconfig || :
@ -1933,8 +1934,8 @@ libkpimexchange-trinity library.
%files -n trinity-libkpimexchange-devel %files -n trinity-libkpimexchange-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_tdeincludedir}/[kt]depim/exchangeaccount.h %{tde_tdeincludedir}/tdepim/exchangeaccount.h
%{tde_tdeincludedir}/[kt]depim/exchangeclient.h %{tde_tdeincludedir}/tdepim/exchangeclient.h
%{tde_libdir}/libkpimexchange.la %{tde_libdir}/libkpimexchange.la
%{tde_libdir}/libkpimexchange.so %{tde_libdir}/libkpimexchange.so
@ -2206,10 +2207,11 @@ fi
cd build cd build
%endif %endif
# Warning: GCC visibility causes FTBFS [Bug #1285]
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \ -DWITH_GCC_VISIBILITY=OFF \

@ -1086,9 +1086,9 @@ cd build
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \
@ -1115,17 +1115,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=%{?buildroot} -C build %__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 # Installs kdepalettes
%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes %__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes

@ -23,7 +23,7 @@
Summary: Trinity Desktop Environment - Toys and Amusements Summary: Trinity Desktop Environment - Toys and Amusements
Name: trinity-tdetoys Name: trinity-tdetoys
Group: Amusements/Graphics Group: Amusements/Graphics
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
@ -392,9 +392,9 @@ cd build
%endif %endif
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \

@ -48,9 +48,9 @@ Provides: trinity-kdeutils-extras = %{version}-%{release}
Obsoletes: tdeutils < %{version}-%{release} Obsoletes: tdeutils < %{version}-%{release}
Provides: tdeutils = %{version}-%{release} Provides: tdeutils = %{version}-%{release}
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{version} BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: gettext BuildRequires: gettext
BuildRequires: net-snmp-devel BuildRequires: net-snmp-devel
@ -997,9 +997,9 @@ cd build
%endif %endif
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \

@ -3,6 +3,8 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_version 14.0.0
# TDE specific building variables # TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
@ -19,7 +21,7 @@
Name: trinity-tdevelop Name: trinity-tdevelop
Summary: Integrated Development Environment for C++/C Summary: Integrated Development Environment for C++/C
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPLv2 License: GPLv2
@ -47,16 +49,16 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: make Requires: make
Requires: perl Requires: perl
Requires: flex >= 2.5.4 Requires: flex >= 2.5.4
Requires: trinity-tqt3-designer Requires: trinity-tqt3-designer >= 3.5.0
Requires: trinity-tqt3-devel Requires: trinity-tqt3-devel >= 3.5.0
Requires: gettext Requires: gettext
Requires: ctags Requires: ctags
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{version} BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdesdk-devel >= %{version} BuildRequires: trinity-tdesdk-devel >= %{tde_version}
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
BuildRequires: db4-devel BuildRequires: db4-devel
%endif %endif
@ -65,14 +67,17 @@ BuildRequires: flex
# Requires kdesdk3. # Requires kdesdk3.
BuildRequires: subversion-devel BuildRequires: subversion-devel
BuildRequires: neon-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} %if 0%{?suse_version}
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
%else %else
BuildRequires: openldap-devel BuildRequires: openldap-devel
%endif %endif
#ACL support
BuildRequires: libacl-devel
Obsoletes: trinity-tdevelop < %{version}-%{release} Obsoletes: trinity-tdevelop < %{version}-%{release}
Provides: trinity-tdevelop = %{version}-%{release} Provides: trinity-tdevelop = %{version}-%{release}
@ -594,12 +599,20 @@ popd
cd build cd build
%endif %endif
# Warning: GCC visibility causes FTBFS [Bug #1285]
%cmake \ %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} \ -DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DCMAKE_SKIP_RPATH="OFF" \ \
-DWITH_BUILDTOOL_ALL=ON \ -DWITH_BUILDTOOL_ALL=ON \
-DWITH_LANGUAGE_ALL=ON \ -DWITH_LANGUAGE_ALL=ON \
-DWITH_VCS_ALL=OFF \ -DWITH_VCS_ALL=OFF \

@ -3,6 +3,8 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_version 14.0.0
# TDE specific building variables # TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
@ -19,7 +21,7 @@
%define _docdir %{tde_docdir} %define _docdir %{tde_docdir}
Name: trinity-tdewebdev Name: trinity-tdewebdev
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Web development applications Summary: Web development applications
@ -43,8 +45,8 @@ Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdesdk-devel >= %{version} BuildRequires: trinity-tdesdk-devel >= %{tde_version}
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
@ -502,14 +504,12 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Do not build against any "/usr" installed KDE
export KDEDIR="%{tde_prefix}"
# Specific path for RHEL4 # Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
# Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \ %configure \
--prefix=%{tde_prefix} \ --prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \
@ -517,11 +517,14 @@ fi
--datadir=%{tde_datadir} \ --datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \ --includedir=%{tde_tdeincludedir} \
--disable-rpath \ \
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \ --enable-new-ldflags \
--enable-final \
--enable-closure \ --enable-closure \
--disable-debug --disable-warnings \ --disable-rpath \
--disable-dependancy-tracking --enable-final --disable-gcc-hidden-visibility
# WTF hack for RHEL4 # WTF hack for RHEL4
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
@ -550,17 +553,6 @@ EOF
done done
cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/ 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 %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}

Loading…
Cancel
Save