RPM Packaging: update 3.5.13.2

pull/3/head
François Andriot 11 years ago
parent d8260a6ce3
commit a89bfaa6c8

@ -75,7 +75,7 @@ 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}

@ -364,7 +364,7 @@ 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}

@ -82,8 +82,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Shitty hack for RHEL4 ... # Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${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
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}

@ -63,7 +63,7 @@ BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
%endif %endif
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
BuildRequires: gstreamer-devel BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel #BuildRequires: gstreamer-plugins-devel
%endif %endif
%if 0%{?rhel} >= 5 || 0%{?fedora} %if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: gstreamer-devel BuildRequires: gstreamer-devel

@ -77,13 +77,10 @@ unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export KDEDIR="%{tde_prefix}" export KDEDIR="%{tde_prefix}"
export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}"
# Shitty hack for RHEL4 ... # Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${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
# Error in "po/tr.po" # Error in "po/tr.po"

@ -75,6 +75,11 @@ unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build
cd build cd build

@ -77,8 +77,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Shitty hack for RHEL4 ... # Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${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
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}

@ -95,7 +95,7 @@ fi
--disable-dependency-tracking --disable-dependency-tracking
# FIXME: bad libtool ?? # FIXME: bad libtool ??
%if 0%{?rhel} == 5 %if 0%{?rhel} == 4 || 0%{?rhel} == 5
%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
%else %else
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
@ -104,7 +104,7 @@ fi
%install %install
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool) %__make install DESTDIR=%{buildroot} LIBTOOL=/usr/bin/libtool
# Unwanted files # Unwanted files
%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a %__rm -f %{buildroot}%{tde_libdir}/libcarddav.a

@ -62,7 +62,7 @@ BuildRequires: libungif-devel
%endif %endif
# DJVU support # DJVU support
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_djvu 1 %define with_djvu 1
BuildRequires: djvulibre BuildRequires: djvulibre
%endif %endif
@ -80,9 +80,6 @@ BuildRequires: xmedcon-devel
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: librsvg2 BuildRequires: librsvg2
%endif %endif
%if 0%{?fedora}
BuildRequires: librsvg2-tools
%endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: librsvg BuildRequires: librsvg
%endif %endif

@ -708,7 +708,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-closure \ --enable-closure \
--enable-rpath \ --enable-rpath \
\ \
--with-extra-includes=%{_includedir}/db4:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \ --with-extra-includes=%{_includedir}/db4:%{_includedir}/db51:%{_includedir}/db53:%{_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 \

@ -636,15 +636,18 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop %{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif %endif
%if 0%{?fedora} >= 19 %if 0%{?fedora} >= 15
%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop %{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop %{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop %{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop %{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop %{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif
%if 0%{?fedora} >= 18
%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop %{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
%endif %endif
@ -675,7 +678,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}

@ -75,7 +75,7 @@ Source7: xdm.oss114
%endif %endif
# Fedora 17: special selinux policy required # Fedora 17: special selinux policy required
%if 0%{?fedora} >= 17 || 0%{?rhel} == 6 %if 0%{?fedora} == 17 ||0%{?fedora} == 19 || 0%{?rhel} == 6
%define with_selinux_policy 1 %define with_selinux_policy 1
Source8: tdm%{?dist}.pp Source8: tdm%{?dist}.pp
%endif %endif
@ -3378,8 +3378,7 @@ export KDEDIR=%{tde_prefix}
# Shitty hack for RHEL4 ... # Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${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
# Samba 4.0 includes (Fedora 18) # Samba 4.0 includes (Fedora 18)

@ -174,7 +174,7 @@ BuildRequires: %{_lib}poppler-devel
%endif %endif
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
# On RHEL 5, the distro-provided poppler is too old. We built a newer one. # On RHEL 5, the distro-provided poppler is too old. We built a newer one.
BuildRequires: trinity-poppler-devel BuildRequires: trinity-poppler-devel >= 0.12
BuildRequires: trinity-poppler-qt3-devel >= 0.12 BuildRequires: trinity-poppler-qt3-devel >= 0.12
%endif %endif
@ -1267,7 +1267,7 @@ 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@ -1279,7 +1279,7 @@ cd build
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG -L%{tde_libdir}" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG -L%{tde_libdir} -I%{tde_includedir}" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \

@ -210,7 +210,7 @@ Requires: ca-certificates
%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt %define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
Requires: openssl Requires: openssl
%endif %endif
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %if 0%{?rhel} == 5
%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
Requires: openssl Requires: openssl
%endif %endif
@ -393,7 +393,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
export KDEDIR="%{tde_prefix}" export KDEDIR="%{tde_prefix}"
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include" export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
fi fi

@ -1092,7 +1092,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}

@ -2203,7 +2203,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}

@ -1097,7 +1097,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build

@ -384,9 +384,13 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%build %build
unset QTDIR || : ; . /etc/profile.d/qt3.sh unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export KDEDIR=%{tde_prefix} export KDEDIR=%{tde_prefix}
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build
cd build cd build

@ -981,8 +981,7 @@ export KDEDIR="%{tde_prefix}"
# Shitty hack for RHEL4 ... # Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" export RPM_OPT_FLAGS="${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
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}

@ -85,8 +85,10 @@ BuildRequires: openldap2-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
%endif %endif
#ACL support # LIBACL support
%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libacl-devel BuildRequires: libacl-devel
%endif
Obsoletes: trinity-tdevelop < %{version}-%{release} Obsoletes: trinity-tdevelop < %{version}-%{release}
Provides: trinity-tdevelop = %{version}-%{release} Provides: trinity-tdevelop = %{version}-%{release}
@ -589,7 +591,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# 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 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi fi
# c references # c references

Loading…
Cancel
Save