From 8af8d5c2c458ec76eca7074bed52ea49e73b477c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 2 Oct 2013 20:15:50 +0200 Subject: [PATCH] RPM Packaging: updates --- .../gtk-qt-engine-14.0.0-fix_gtk3_segv.patch | 3 +- .../gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 4 +- .../klcddimmer/klcddimmer-14.0.0.spec | 4 +- .../tdepowersave/tdepowersave-14.0.0.spec | 4 - ...ke-add-translation-and-documentation.patch | 32 ------ .../trinity-cmake-translations.patch | 98 ------------------- redhat/buildall-r14.sh | 82 ++++++++++++---- .../trinity-desktop-14.0.0.spec | 1 + redhat/tdebase/tdebase-14.0.0.spec | 22 ++--- redhat/tdenetwork/tdenetwork-14.0.0.spec | 3 - 10 files changed, 83 insertions(+), 170 deletions(-) delete mode 100644 redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch delete mode 100644 redhat/applications/tdepowersave/trinity-cmake-translations.patch diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch index 73021cb11..f3e37218e 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch @@ -1,6 +1,6 @@ --- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ORI 2013-07-23 23:35:16.614406882 +0200 +++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp 2013-07-23 23:56:39.121594541 +0200 -@@ -261,13 +261,21 @@ +@@ -261,13 +261,22 @@ } } @@ -20,6 +20,7 @@ + if(gtk3installed) { + widget->styleBox3->insertStringList(otherGtk3Styles); + } ++ otherGtk3Styles.clear(); widget->styleKde3->setEnabled(gtk3installed); + widget->styleBox3->setEnabled(gtk3installed); + widget->styleOther3->setEnabled(gtk3installed); diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index d51ec3f2e..2bbcf8c43 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -44,6 +44,7 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 +Patch0: gtk-qt-engine-14.0.0-debug.patch Patch1: gtk-qt-engine-14.0.0-fix_gtk3_segv.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -72,7 +73,8 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .segv +%patch0 -p1 -b .debug +#patch1 -p1 -b .segv %build diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec index de2535703..337caedd4 100644 --- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec +++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec @@ -99,8 +99,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} @@ -115,7 +113,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tde_pkg}.lang +%files %defattr(-,root,root,-) %doc AUTHORS COPYING LICENSE NEWS README %{tde_libdir}/klcddimmer_panelapplet.la diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index 2dd719162..c1d23ec3a 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -41,8 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: trinity-cmake-translations.patch -Patch2: tdepowersave-cmake-add-translation-and-documentation.patch Patch3: tdepowersave-14.0.0-test.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -91,8 +89,6 @@ settings for: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .lang -%patch2 -p1 -b .lang #patch3 -p1 -b .test diff --git a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch b/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch deleted file mode 100644 index a30f264a4..000000000 --- a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- trinity-tdepowersave-14.0.0~pre158+340d2058/po/CMakeLists.txt 2013-08-19 06:54:55.000000000 +0200 -+++ trinity-tdepowersave-14.0.0~pre158+340d2058/po/CMakeLists.txt.new 2013-08-19 19:25:41.566465666 +0200 -@@ -9,9 +9,4 @@ - # - ################################################# - --# file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tdepowersave.po ) -- --foreach( _po ${po_files} ) -- get_filename_component( _lang ${_po} PATH ) -- tde_create_translation( FILES ${_po} LANG ${_lang} ) --endforeach( ) -+tde_create_translation( LANG auto OUTPUT_NAME tdepowersave ) -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index c257983..68fca16 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -57,6 +57,14 @@ if( NOT DBUS_TQT_FOUND ) - tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) - endif( ) - -+# check for msgfmt -+if( NOT DEFINED MSGFMT_EXECUTABLE ) -+ find_program( MSGFMT_EXECUTABLE msgfmt ) -+ if( NOT MSGFMT_EXECUTABLE ) -+ tde_message_fatal( "msgfmt program is required, but was not found on your system" ) -+ endif( ) -+endif( ) -+ - - # required stuff - find_package( TQt ) diff --git a/redhat/applications/tdepowersave/trinity-cmake-translations.patch b/redhat/applications/tdepowersave/trinity-cmake-translations.patch deleted file mode 100644 index d97302ba3..000000000 --- a/redhat/applications/tdepowersave/trinity-cmake-translations.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake -index f290e2b..282b765 100644 ---- a/cmake/modules/TDEMacros.cmake -+++ b/cmake/modules/TDEMacros.cmake -@@ -1049,6 +1049,7 @@ macro( tde_create_translation ) - unset( _srcs ) - unset( _lang ) - unset( _dest ) -+ unset( _out_name ) - unset( _directive ) - unset( _var ) - -@@ -1075,6 +1076,13 @@ macro( tde_create_translation ) - set( _directive 1 ) - endif( ) - -+ # found directive "DESTINATION" -+ if( "${_arg}" STREQUAL "OUTPUT_NAME" ) -+ unset( _proj ) -+ set( _var _out_name ) -+ set( _directive 1 ) -+ endif( ) -+ - # collect data - if( _directive ) - unset( _directive ) -@@ -1088,30 +1096,60 @@ macro( tde_create_translation ) - tde_message_fatal( "MSGFMT_EXECUTABLE variable is not defined" ) - elseif( NOT _lang ) - tde_message_fatal( "missing LANG directive" ) -- elseif( NOT _dest ) -- set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" ) - endif( ) - - # if no file specified, include all *.po files - if( NOT _srcs ) - file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) -- endif() -+ endif( ) - if( NOT _srcs ) - tde_message_fatal( "no source files" ) -- endif() -+ endif( ) -+ -+ if( NOT _lang STREQUAL "auto") -+ set( _real_lang ${_lang} ) -+ -+ if( NOT _dest ) -+ set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" ) -+ endif( ) -+ -+ # OUTPUT_NAME can only be used if we have only one file -+ list( LENGTH _srcs _srcs_num) -+ if( _out_name AND _srcs_num GREATER 1 ) -+ tde_message_fatal( "OUTPUT_NAME can be supplied only with single file or LANG=auto" ) -+ endif( ) -+ -+ elseif( NOT _out_name ) -+ tde_message_fatal( "LANG=auto reqires OUTPUT_NAME directive to be set" ) -+ elseif( _dest ) -+ tde_message_fatal( "DESTINATION cannot be used with LANG=auto" ) -+ endif( ) - - # generate *.mo files - foreach( _src ${_srcs} ) -+ - get_filename_component( _src ${_src} ABSOLUTE ) -- get_filename_component( _out ${_src} NAME_WE ) -- set( _out_name "${_out}-${_lang}.mo" ) -- set( _out_real_name "${_out}.mo" ) -+ -+ if( _out_name ) -+ set( _out ${_out_name} ) -+ if( _lang STREQUAL "auto" ) -+ get_filename_component( _real_lang ${_src} NAME_WE ) -+ set( _dest "${LOCALE_INSTALL_DIR}/${_real_lang}/LC_MESSAGES" ) -+ endif( ) -+ else( ) -+ get_filename_component( _out ${_src} NAME_WE ) -+ endif( ) -+ -+ set( _out_filename "${_out}-${_real_lang}.mo" ) -+ set( _install_filename "${_out}.mo" ) -+ - add_custom_command( -- OUTPUT ${_out_name} -- COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_name} -+ OUTPUT ${_out_filename} -+ COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_filename} - DEPENDS ${_src} ) -- add_custom_target( "${_out}-${_lang}-translation" ALL DEPENDS ${_out_name} ) -- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_name} RENAME ${_out_real_name} DESTINATION ${_dest} ) -+ add_custom_target( "${_out}-${_real_lang}-translation" ALL DEPENDS ${_out_filename} ) -+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_filename} RENAME ${_install_filename} DESTINATION ${_dest} ) -+ - endforeach( ) - - endmacro( ) diff --git a/redhat/buildall-r14.sh b/redhat/buildall-r14.sh index 72a98a317..4b78f646f 100755 --- a/redhat/buildall-r14.sh +++ b/redhat/buildall-r14.sh @@ -8,6 +8,7 @@ grp='./genrpm.sh -v 14.0.0 -a' BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" DIST="$(rpm -E %{dist})" +LIB="$(rpm -E %_lib)" if [ -x /usr/sbin/urpmi ]; then PKGMGR="urpmi" @@ -91,17 +92,26 @@ grpiud() { # TQT3 grpiud dependencies/tqt3 +if [ "${DIST}" = ".el4" ] || [ "${DIST}" = ".el5" ]; then + grpiud 3rdparty/poppler +fi +if [ "${DIST}" = ".el4" ] || [ "${DIST}" = ".el5" ]; then + grpiud 3rdparty/sip +fi + # TDE dependencies grpiud dependencies/tqtinterface grpiud dependencies/arts -grpiud dependencies/avahi-tqt -grpiud dependencies/dbus-1-tqt -grpiud dependencies/dbus-tqt grpiud dependencies/libart-lgpl grpiud dependencies/libcaldav grpiud dependencies/libcarddav grpiud dependencies/tqca -grpiui dependencies/tqca-tls +if [ "${DIST}" != ".el4" ]; then + grpiud dependencies/avahi-tqt + grpiud dependencies/dbus-1-tqt + grpiud dependencies/dbus-tqt + grpiui dependencies/tqca-tls +fi # Extra dependencies grpiud extras/akode @@ -135,10 +145,10 @@ grpiui tdeutils if ! is_installed trinity-desktop; then grpiu extras/trinity-desktop eval ${PKGINST} trinity-desktop || exit 1 - # Disable trinity repository from here !!! - if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then - sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g" - fi +fi +# Disable trinity repository from here !!! +if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then + sudo sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g" fi # devel packages @@ -149,10 +159,10 @@ if ! is_installed trinity-desktop-devel; then eval ${PKGINST} trinity-desktop-devel || exit 1 fi -# Extra libraries +# 3rd party libraries ## IMLIB1: required for kuickshow -if ! is_installed imlib1-devel; then +if ! is_installed imlib1-devel && ! is_installed imlib-devel; then grpiu 3rdparty/imlib1 eval ${PKGINST} imlib1-devel || exit 1 fi @@ -165,18 +175,42 @@ if [ "${DIST:0:4}" != ".mga" ]; then eval ${PKGINST} wv2-devel || exit 1 fi fi + +## LIBOTR3: required for kopete-otr +if [ "${DIST:0:5}" = ".mga3" ]; then + if ! is_installed libotr3; then + grpiu 3rdparty/libotr3 + eval ${PKGINST} libotr3 || exit 1 + eval ${PKGINST} libotr3-devel || exit 1 + fi +fi + ## TORSOCKS: required for tork if ! is_installed torsocks; then grpiu 3rdparty/torsocks eval ${PKGINST} torsocks || exit 1 fi -if [ "${DIST:0:4}" = ".oss" ]; then + +## PCSC-PERL: for smartcardauth +if [ "${DIST:0:4}" = ".oss" ] || [ "${DIST:0:3}" = ".el" ]; then if ! is_installed pcsc-perl; then grpiu 3rdparty/pcsc-perl eval ${PKGINST} pcsc-perl || exit 1 fi fi +## Lilypond: needed for rosegarden +if [ "${DIST}" = ".el6" ]; then + if ! is_installed mftrace; then + grpiu 3rdparty/mftrace + eval ${PKGINST} mftrace || exit 1 + fi + if ! is_installed lilypond; then + grpiu 3rdparty/lilypond + eval ${PKGINST} lilypond || exit 1 + fi +fi + # TDE libraries grpiud libraries/libkdcraw grpiud libraries/libkexiv2 @@ -220,7 +254,9 @@ grpiui applications/kcmldapcontroller grpiui applications/kcmldapmanager grpiui applications/kcpuload grpiui applications/kdbg -grpiui applications/kdbusnotification +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kdbusnotification +fi grpiui applications/kdiff3 grpiui applications/kdirstat grpiui applications/keep @@ -228,11 +264,16 @@ grpiui applications/kerberostray #grpiui applications/kerry grpiui applications/kftpgrabber grpiui applications/kile -grpiui applications/kima +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kima +fi grpiui applications/kiosktool grpiui applications/kkbswitch grpiui applications/klcddimmer -grpiui applications/kmplayer +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kmplayer +fi + grpiui applications/kmyfirewall grpiui applications/kmymoney grpiui applications/knemo @@ -249,7 +290,9 @@ fi grpiui applications/konversation grpiui applications/kopete-otr grpiui applications/kpicosim -grpiui applications/kpilot +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kpilot +fi grpiui applications/krecipes grpiui applications/krename grpiui applications/krusader @@ -269,7 +312,9 @@ grpiui applications/kvpnc grpiui applications/mplayerthumbs grpiui applications/piklab grpiui applications/potracegui -grpiui applications/rosegarden +if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then + grpiui applications/rosegarden +fi grpiui applications/smartcardauth grpiui applications/smb4k grpiui applications/soundkonverter @@ -277,6 +322,7 @@ grpiui applications/tde-guidance grpiui applications/tdeio-apt grpiui applications/tdeio-ftps grpiui applications/tdeio-locate +grpiui applications/tdeio-sword grpiui applications/tdeio-umountwrapper grpiui applications/tdenetworkmanager grpiui applications/tdepowersave @@ -284,7 +330,9 @@ grpiui applications/tderadio grpiui applications/tde-style-lipstik grpiui applications/tde-style-qtcurve grpiui applications/tdesudo -grpiui applications/tdesvn +if [ "${DIST}" != ".el4" ]; then + grpiui applications/tdesvn +fi grpiui applications/tde-systemsettings grpiui applications/tdmtheme grpiui applications/tellico diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index f16039020..e8e46792e 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -168,6 +168,7 @@ Requires: trinity-tde-systemsettings Requires: trinity-tdeio-apt Requires: trinity-tdeio-ftps Requires: trinity-tdeio-locate +Requires: trinity-tdeio-sword Requires: trinity-tdeio-umountwrapper Requires: trinity-tdenetworkmanager Requires: trinity-tdepowersave diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 0749e07c0..ca65457af 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -544,9 +544,6 @@ Requires: openssl # RHEL 6 Configuration files are provided in separate packages %if 0%{?rhel} || 0%{?fedora} -%if "%{?tde_prefix}" == "/usr" -Requires: kde-settings-kdm -%endif Requires: redhat-menus %endif @@ -3337,20 +3334,22 @@ cd build -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ + -DWITH_ALL_OPTIONS=ON \ -DWITH_SASL=ON \ -DWITH_LDAP=ON \ -DWITH_SAMBA=ON \ - %{?with_exr:-DWITH_OPENEXR=ON} \ + %{?!with_exr:-DWITH_OPENEXR=OFF} \ -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XFIXES=ON \ - %{?with_xrandr:-DWITH_XRANDR=ON} \ + %{?!with_xrandr:-DWITH_XRANDR=OFF} \ -DWITH_XRENDER=ON \ -DWITH_XDAMAGE=ON \ -DWITH_XEXT=ON \ - %{?with_xtest:-DWITH_XTEST=ON} \ - %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \ - %{?with_libart:-DWITH_LIBART=ON} \ + %{?!with_xtest:-DWITH_XTEST=OFF} \ + -DWITH_OPENGL=ON \ + %{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ + %{?!with_libart:-DWITH_LIBART=OFF} \ -DWITH_LIBUSB=ON \ -DWITH_LIBRAW1394=ON \ -DWITH_SUDO_TDESU_BACKEND=OFF \ @@ -3360,7 +3359,8 @@ cd build -DWITH_XINERAMA=ON \ -DWITH_ARTS=ON \ -DWITH_I8K=ON \ - %{?with_hal:-DWITH_HAL=ON} \ + -DWITH_SENSORS=ON \ + -DWITH_HAL=OFF \ -DWITH_TDEHWLIB=ON \ -DWITH_UPOWER=ON \ -DWITH_GCC_VISIBILITY=ON \ @@ -3369,11 +3369,11 @@ cd build %if 0%{?suse_version} -DKCHECKPASS_PAM_SERVICE="xdm" \ -DTDM_PAM_SERVICE="xdm" \ - -DKSCREENSAVER_PAM_SERVICE="xdm" \ + -DTDESCREENSAVER_PAM_SERVICE="xdm" \ %else -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ -DTDM_PAM_SERVICE="tdm-trinity" \ - -DKSCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ + -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ %endif %{!?with_tsak:-DBUILD_TSAK=OFF} \ .. diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index 2d2405e8d..5701a1e14 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -54,8 +54,6 @@ Source2: ktalk # RedHat/Fedora legacy patches Patch4: kdenetwork-3.2.3-resolv.patch -# include more/proper ppp headers -Patch6: kdenetwork-3.5.9-krfb_httpd.patch # [kdenetwork] Missing LDFLAGS cause FTBFS Patch1: kdenetwork-3.5.13-missing_ldflags.patch @@ -1078,7 +1076,6 @@ update-desktop-database 2> /dev/null || : %patch1 -p1 -b .ldflags %patch4 -p1 -b .resolv -%patch6 -p1 -b .krfb_httpd %if 0%{?rhel} == 4 %patch201 -p1 -b .rhel4