TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: update R14 main packages

Browse Source
pull/3/head
François Andriot 11 years ago
parent aa051be452
commit 1b4d42e2cb
8 changed files with 111 additions and 96 deletions
Show Stats Download Patch File Download Diff File

133
redhat/tdeaddons/tdeaddons-14.0.0.spec
Unescape View File

@ -416,7 +416,7 @@ graphical disk usage viewer and image conversions and transformations.
%files -n trinity-konq-plugins
%defattr(-,root,root,-)
%doc konq-plugins/README
%{tde_datadir}/config/translaterc
%{_sysconfdir}/trinity/translaterc
%{tde_bindir}/fsview
%{tde_bindir}/jpegorient
%{tde_bindir}/tdeio_media_realfolder
@ -504,44 +504,25 @@ graphical disk usage viewer and image conversions and transformations.
%{tde_datadir}/apps/metabar/themes/default/layout.html
%{tde_datadir}/apps/microformat/pics/microformat.png
%{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg
%{tde_datadir}/icons/locolor/16x16/apps/autorefresh.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/babelfish.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesync.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/validators.png
%{tde_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/babelfish.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesync.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/validators.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png
%{tde_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/crystalsvg/32x32/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/crystalsvg/48x48/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/hicolor/16x16/apps/metabar.png
%{tde_datadir}/icons/hicolor/22x22/apps/fsview.png
%{tde_datadir}/icons/hicolor/32x32/apps/fsview.png
%{tde_datadir}/icons/hicolor/32x32/apps/metabar.png
%{tde_datadir}/icons/hicolor/48x48/apps/metabar.png
%{tde_datadir}/icons/hicolor/64x64/apps/metabar.png
%{tde_datadir}/icons/crystalsvg/*/actions/babelfish.png
%{tde_datadir}/icons/crystalsvg/*/actions/cssvalidator.png
%{tde_datadir}/icons/crystalsvg/*/actions/domtreeviewer.png
%{tde_datadir}/icons/crystalsvg/*/actions/htmlvalidator.png
%{tde_datadir}/icons/crystalsvg/*/actions/imagegallery.png
%{tde_datadir}/icons/crystalsvg/*/actions/remotesync.png
%{tde_datadir}/icons/crystalsvg/*/actions/remotesyncconfig.png
%{tde_datadir}/icons/crystalsvg/*/actions/minitools.png
%{tde_datadir}/icons/crystalsvg/*/actions/validators.png
%{tde_datadir}/icons/crystalsvg/*/actions/webarchiver.png
%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_delicious.png
%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_news.png
%{tde_datadir}/icons/crystalsvg/*/actions/minitools.png
%{tde_datadir}/icons/hicolor/*/apps/metabar.png
%{tde_datadir}/icons/hicolor/*/apps/fsview.png
%{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz
%{tde_datadir}/icons/hicolor/128x128/apps/metabar.png
%{tde_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/icons/locolor/*/apps/autorefresh.png
%{tde_datadir}/icons/locolor/*/apps/konqsidebar_mediaplayer.png
%{tde_datadir}/services/akregator_konqplugin.desktop
%{tde_datadir}/services/ark_plugin.desktop
%{tde_datadir}/services/fsview_part.desktop
@ -683,51 +664,67 @@ done
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
# Note about DB4:
# Fedora 18: /usr/include/libdb4/db_cxx.h , /usr/lib64/libdb_cxx-4.so
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
%endif
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
if [ -d "/usr/include/db53" ]; then
export CMAKE_INCLUDE_PATH="/usr/include/db53"
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \
\
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \
--enable-final \
--enable-closure \
--enable-rpath \
--enable-gcc-hidden-visibility \
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
\
--with-extra-includes=%{_includedir}/db4:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \
-DWITH_ALL_OPTIONS=ON \
-DWITH_ARTS=ON \
-DWITH_SDL=ON \
-DWITH_BERKELEY_DB=ON \
-DWITH_XMMS=OFF \
-DWITH_TEST=OFF \
\
%{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \
--with-sdl \
%if 0%{?with_db}
--with-berkeley-db \
%endif
%__make %{?_smp_mflags}
-DBUILD_ALL=ON \
-DBUILD_ATLANTIKDESIGNER=ON \
-DBUILD_DOC=ON \
-DBUILD_KADDRESSBOOK_PLUGINS=ON \
-DBUILD_KATE_PLUGINS=ON \
-DBUILD_KICKER_APPLETS=ON \
-DBUILD_KNEWSTICKER_SCRIPTS=ON \
-DBUILD_KONQ_PLUGINS=ON \
-DBUILD_KSIG=ON \
-DBUILD_NOATUN_PLUGINS=ON \
-DBUILD_RENAMEDLG_PLUGINS=ON \
-DBUILD_TDEFILE_PLUGINS=ON \
..
%__make %{?_smp_mflags} || %__make
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
%__make install DESTDIR=%{buildroot} -C build
%clean

2
redhat/tdeadmin/tdeadmin-14.0.0.spec
Unescape View File

@ -413,7 +413,7 @@ fi
--with-shadow \
--with-private-groups
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} || %__make
%install

34
redhat/tdebase/tdebase-14.0.0.spec
Unescape View File

@ -90,7 +90,6 @@ Patch4: tdebase-14.0.0-kickoff_default_favs.patch
Patch5: tdebase-14.0.0-konsole_wordseps.patch
# Permanent patches, this TDE version only
# None !
# Patches from Mandriva
Patch101: tdebase-14.0.0-vibrate_dialog.patch
@ -105,6 +104,9 @@ Patch201: tdebase-14.0.0-kcm_xcursor_applytheme.patch
## [tdebase] Fix i18n description loading in 'twin_update_default_rules'
Patch202: tdebase-14.0.0-fix_twin_rules_translation.patch
Patch203: tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
### Distribution-specific settings ###
# Fedora 15 Theme: "Lovelock"
@ -164,7 +166,6 @@ Requires: fedora-release-notes
%define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html
%endif
# RHEL 4 Theme
%if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic
@ -457,18 +458,24 @@ BuildRequires: libsmbclient-devel
BuildRequires: imake
%endif
# XKB support
%if 0%{?suse_version} == 1140
BuildRequires: xorg-x11-libxkbfile-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
BuildRequires: libxkbfile-devel
%endif
# X11 stuff ...
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
%if 0%{?suse_version} == 1140
BuildRequires: xorg-x11-libxkbfile-devel
BuildRequires: xorg-x11-libfontenc-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
BuildRequires: libxkbfile-devel
BuildRequires: libfontenc-devel
%endif
@ -602,7 +609,7 @@ This is a meta-package that installs all tdebase development packages.
Header files for developing applications using %{name}.
Install tdebase-devel if you want to develop or compile Konqueror,
Kate plugins or KWin styles.
Kate plugins or TWin styles.
%files devel
%defattr(-,root,root,-)
@ -3263,6 +3270,8 @@ Windows and Samba shares.
%patch201 -p1 -b .kcmxcursor
%patch202 -p1 -b .twintranslation
%patch203 -p1 -b .iocharset
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
# TDM Background
@ -3302,6 +3311,21 @@ Windows and Samba shares.
%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
%endif
# Reboot command location may vary on some distributions
if [ -x "/usr/bin/reboot" ]; then
POWEROFF="/usr/bin/poweroff"
REBOOT="/usr/bin/reboot"
fi
if [ -n "${REBOOT}" ]; then
%__sed -i \
"doc/tdm/index.docbook" \
"doc/kcontrol/tdm/index.docbook" \
"kcontrol/tdm/tdm-shut.cpp" \
"tdm/config.def" \
-e "s|/sbin/poweroff|${POWEROFF}|g" \
-e "s|/sbin/reboot|${REBOOT}|g"
fi
%build
unset QTDIR QTINC QTLIB

2
redhat/tdebindings/tdebindings-14.0.0.spec
Unescape View File

@ -1037,7 +1037,7 @@ fi
pushd dcopperl
CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
# Ugly hack to modify the man pages directory
# [Bug #348] Ugly hack to modify the man pages directory
sed -i Makefile \
-e "s|/usr/share/man|%{tde_mandir}|g"

3
redhat/tdelibs/tdelibs-14.0.0.spec
Unescape View File

@ -125,7 +125,7 @@ Requires: udisks
%endif
# PMOUNT support
Requires: pmount
#Requires: pmount
# UDISKS2 support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@ -501,6 +501,7 @@ cd build
-DWITH_KDE4_MENU_SUFFIX=OFF \
-DWITH_ASPELL=ON \
%{?!with_hspell:-DWITH_HSPELL=OFF} \
-DWITH_TDEICONLOADER_DEBUG=OFF \
..
%__make %{?_smp_mflags} || %__make

7
redhat/tdenetwork/tdenetwork-14.0.0.spec
Unescape View File

@ -52,12 +52,13 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kppp.pamd
Source2: ktalk
# RedHat/Fedora legacy patches
Patch4: kdenetwork-3.2.3-resolv.patch
# [kdenetwork] Missing LDFLAGS cause FTBFS
Patch1: kdenetwork-3.5.13-missing_ldflags.patch
# RedHat/Fedora legacy patches
Patch4: kdenetwork-3.2.3-resolv.patch
# RHEL4 specific
Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch
Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch
@ -79,7 +80,7 @@ BuildRequires: sqlite-devel
# GADU support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_gadu 1
%define with_gadu 1tdenetwork-14.0.0-fix_kget.patch
BuildRequires: libgadu-devel
%endif

12
redhat/tdesdk/tdesdk-14.0.0.spec
Unescape View File

@ -974,11 +974,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/services/svn+https.protocol
%{tde_datadir}/services/svn+ssh.protocol
%{tde_datadir}/services/svn.protocol
%{_sysconfdir}/alternatives/svn+file.protocol
%{_sysconfdir}/alternatives/svn+http.protocol
%{_sysconfdir}/alternatives/svn+https.protocol
%{_sysconfdir}/alternatives/svn+ssh.protocol
%{_sysconfdir}/alternatives/svn.protocol
%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png
%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png
%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png
@ -1148,13 +1143,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__ln_s -f /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
%__ln_s -f /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
%__ln_s -f /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
%__mkdir_p %{?buildroot}/etc/alternatives
%__ln_s -f %{tde_datadir}/services/svn+file.protocol %{?buildroot}/etc/alternatives/svn+file.protocol
%__ln_s -f %{tde_datadir}/services/svn+http.protocol %{?buildroot}/etc/alternatives/svn+http.protocol
%__ln_s -f %{tde_datadir}/services/svn+https.protocol %{?buildroot}/etc/alternatives/svn+https.protocol
%__ln_s -f %{tde_datadir}/services/svn+ssh.protocol %{?buildroot}/etc/alternatives/svn+ssh.protocol
%__ln_s -f %{tde_datadir}/services/svn.protocol %{?buildroot}/etc/alternatives/svn.protocol
%endif
# Removes useless stuff

12
redhat/tdewebdev/tdewebdev-14.0.0.spec
Unescape View File

@ -47,8 +47,8 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: desktop-file-utils
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdesdk-devel >= %{tde_version}
BuildRequires: libxslt-devel
BuildRequires: libxml2-devel
%if 0%{?rhel} == 4
# a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
BuildRequires: libgcrypt-devel
@ -58,6 +58,7 @@ BuildRequires: perl
# KXSLDBG requires libxml2
#if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || ( 0%{?fedora} > 0 && %{?fedora} <= 17 ) || 0%{?suse_version}
%define build_kxsldbg 1
BuildRequires: libxml2-devel
#endif
@ -426,8 +427,8 @@ This package is part of TDE, as a component of the TDE web development module.
%{tde_tdelibdir}/libkxsldbgpart.la
%{tde_tdelibdir}/libkxsldbgpart.so
%{tde_tdeappdir}/kxsldbg.desktop
%{tde_datadir}/apps/kxsldbg
%{tde_datadir}/apps/kxsldbgpart
%{tde_datadir}/apps/kxsldbg/
%{tde_datadir}/apps/kxsldbgpart/
%{tde_tdedocdir}/HTML/en/kxsldbg/
%{tde_tdedocdir}/HTML/en/xsldbg/
%{tde_datadir}/icons/hicolor/*/actions/1downarrow.png
@ -524,7 +525,10 @@ fi
--enable-final \
--enable-closure \
--enable-rpath \
--disable-gcc-hidden-visibility
--disable-gcc-hidden-visibility \
\
--enable-editors
# WTF hack for RHEL4
%if 0%{?rhel} == 4

Write Preview
Loading…
Cancel
Save