From 0c4b32438a57f52601dfe66d133bd263a5d304ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 24 Jul 2013 11:25:02 +0200 Subject: RPM Packaging: updates for R14 --- .../gtk-qt-engine-14.0.0-fix_gtk3_segv.patch | 28 ++ .../gtk-qt-engine/gtk-qt-engine-14.0.0.spec | 9 +- redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec | 287 +++++++++++++-------- redhat/applications/kcmldap/kcmldap-14.0.0.spec | 6 +- .../kcmldapcontroller-14.0.0.spec | 4 +- .../kcmldapmanager/kcmldapmanager-14.0.0.spec | 4 +- .../kerberostray/kerberostray-14.0.0.spec | 2 - redhat/applications/kvirc/kvirc-14.0.0.spec | 4 +- .../qt4-tqt-theme-engine-14.0.0.spec | 7 +- .../applications/rosegarden/rosegarden-14.0.0.spec | 2 +- .../soundkonverter/soundkonverter-14.0.0.spec | 2 +- redhat/applications/tdesvn/tdesvn-14.0.0.spec | 4 +- 12 files changed, 235 insertions(+), 124 deletions(-) create mode 100644 redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch (limited to 'redhat/applications') 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 new file mode 100644 index 000000000..73021cb11 --- /dev/null +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch @@ -0,0 +1,28 @@ +--- 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 @@ + } + } + ++ bool gtk3installed = false; + widget->styleBox3->clear(); + TQStringList otherGtk3Styles = gtk3Themes.keys(); +- otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); +- widget->styleBox3->insertStringList(otherGtk3Styles); +- +- bool gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end()); ++ if(!otherGtk3Styles.empty()) { ++ otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); ++ if(!otherGtk3Styles.empty()) { ++ gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end()); ++ } ++ } ++ if(gtk3installed) { ++ widget->styleBox3->insertStringList(otherGtk3Styles); ++ } + widget->styleKde3->setEnabled(gtk3installed); ++ widget->styleBox3->setEnabled(gtk3installed); ++ widget->styleOther3->setEnabled(gtk3installed); + widget->warning4->setHidden(gtk3installed); + widget->warning5->setHidden(gtk3installed); + widget->warning6->setHidden(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 384d73c46..6f21d16f7 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 @@ -40,9 +40,11 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 +Source1: gtk-qt-engine.rc.sh +Source2: gtkrc-2.0-kde4 +Source3: gtkrc-2.0-kde-kde4 + +Patch1: gtk-qt-engine-14.0.0-fix_gtk3_segv.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -68,6 +70,7 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .segv # Renames the '.po' files for f in po/*/*.po; do diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec index d66401cf3..0cd051c82 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec @@ -65,109 +65,265 @@ steps of the burning process the beginner may find comfort in the automatic settings and the reasonable k3b defaults which allow a quick start. -%package da +########## + +%package Danish Group: Applications/Archiving Requires: trinity-k3b Summary: Danish (da) translations for K3B [Trinity] -%description da + +Obsoletes: trinity-k3b-i18n-da < %{version}-%{release} +Provides: trinity-k3b-i18n-da = %{version}-%{release} + +%description Danish This package contains the Danish translations for K3B. -%package de +%files Danish +%defattr(-,root,root,-) +%lang(da) %{tde_tdedocdir}/HTML/da/k3b +%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo + +########## + +%package German Group: Applications/Archiving Requires: trinity-k3b Summary: German (de) translations for K3B [Trinity] -%description de + +Obsoletes: trinity-k3b-i18n-de < %{version}-%{release} +Provides: trinity-k3b-i18n-de = %{version}-%{release} + +%description German This package contains the German translations for K3B. -%package el +%files German +%defattr(-,root,root,-) +%lang(de) %{tde_tdedocdir}/HTML/de/k3b +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo + +########## + +%package Greek Group: Applications/Archiving Requires: trinity-k3b >= %{version} Summary: Greek (el) translations for K3B [Trinity] -%description el + +Obsoletes: trinity-k3b-i18n-el < %{version}-%{release} +Provides: trinity-k3b-i18n-el = %{version}-%{release} + +%description Greek This package contains the greek translations for K3B. -%package es +%files Greek +%defattr(-,root,root,-) +#%lang(el) %{tde_tdedocdir}/HTML/el/k3b +%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo + +########## + +%package Spanish Group: Applications/Archiving Requires: trinity-k3b Summary: Spanish (es) translations for K3B [Trinity] -%description es + +Obsoletes: trinity-k3b-i18n-es < %{version}-%{release} +Provides: trinity-k3b-i18n-es = %{version}-%{release} + +%description Spanish This package contains the Spanish translations for K3B. -%package et +%files Spanish +%defattr(-,root,root,-) +%lang(es) %{tde_tdedocdir}/HTML/es/k3b +%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo + +########## + +%package Estonian Group: Applications/Archiving Requires: trinity-k3b Summary: Estonian (et) translations for K3B [Trinity] -%description et + +Obsoletes: trinity-k3b-i18n-et < %{version}-%{release} +Provides: trinity-k3b-i18n-et = %{version}-%{release} + +%description Estonian This package contains the Estonian translations for K3B. -%package fr +%files Estonian +%defattr(-,root,root,-) +%lang(et) %{tde_tdedocdir}/HTML/et/k3b +%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo + +########## + +%package French Group: Applications/Archiving Requires: trinity-k3b Summary: French (fr) translations for K3B [Trinity] -%description fr + +Obsoletes: trinity-k3b-i18n-fr < %{version}-%{release} +Provides: trinity-k3b-i18n-fr = %{version}-%{release} + +%description French This package contains the French translations for K3B. -%package it +%files French +%defattr(-,root,root,-) +%lang(fr) %{tde_tdedocdir}/HTML/fr/k3b +%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo + +########## + +%package Italian Group: Applications/Archiving Requires: trinity-k3b Summary: Italian (it) translations for K3B [Trinity] -%description it + +Obsoletes: trinity-k3b-i18n-it < %{version}-%{release} +Provides: trinity-k3b-i18n-it = %{version}-%{release} + +%description Italian This package contains the Italian translations for K3B. -%package nl +%files Italian +%defattr(-,root,root,-) +%lang(it) %{tde_tdedocdir}/HTML/it/k3b +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo + +########## + +%package Dutch Group: Applications/Archiving Requires: trinity-k3b Summary: Dutch (nl) translations for K3B [Trinity] -%description nl + +Obsoletes: trinity-k3b-i18n-nl < %{version}-%{release} +Provides: trinity-k3b-i18n-nl = %{version}-%{release} + +%description Dutch This package contains the Dutch translations for K3B. -%package pl +%files Dutch +%defattr(-,root,root,-) +%lang(nl) %{tde_tdedocdir}/HTML/nl/k3b +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo + +########## + +%package Polish Group: Applications/Archiving Requires: trinity-k3b Summary: Polish (pl) translations for K3B [Trinity] -%description pl + +Obsoletes: trinity-k3b-i18n-pl < %{version}-%{release} +Provides: trinity-k3b-i18n-pl = %{version}-%{release} + +%description Polish This package contains the Polish translations for K3B. -%package pt +%files Polish +%defattr(-,root,root,-) +%lang(pl) %{tde_tdedocdir}/HTML/pl/k3b +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo + +########## + +%package Portuguese Group: Applications/Archiving Requires: trinity-k3b Summary: Portuguese (pt) translations for K3B [Trinity] -%description pt + +Obsoletes: trinity-k3b-i18n-pt < %{version}-%{release} +Provides: trinity-k3b-i18n-pt = %{version}-%{release} + +%description Portuguese This package contains the Portuguese translations for K3B. -%package ptbr +%files Portuguese +%defattr(-,root,root,-) +%lang(pt) %{tde_tdedocdir}/HTML/pt/k3b +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo + +########## + +%package Brazil Group: Applications/Archiving Requires: trinity-k3b Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity] -%description ptbr + +Obsoletes: trinity-k3b-i18n-pt_BR < %{version}-%{release} +Provides: trinity-k3b-i18n-pt_BR = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-ptbr < %{version}-%{release} +Provides: trinity-k3b-i18n-ptbr = %{version}-%{release} + +%description Brazil This package contains the Brazilian Portuguese translations for K3B. -%package ru +%files Brazil +%defattr(-,root,root,-) +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/k3b +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo + +########## + +%package Russian Group: Applications/Archiving Requires: trinity-k3b Summary: Russian (ru) translations for K3B [Trinity] -%description ru + +Obsoletes: trinity-k3b-i18n-ru < %{version}-%{release} +Provides: trinity-k3b-i18n-ru = %{version}-%{release} + +%description Russian This package contains the Russian translations for K3B. -%package sv +%files Russian +%defattr(-,root,root,-) +%lang(ru) %{tde_tdedocdir}/HTML/ru/k3b +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo + +########## + +%package Swedish Group: Applications/Archiving Requires: trinity-k3b Summary: Swedish (sv) translations for K3B [Trinity] -%description sv + +Obsoletes: trinity-k3b-i18n-sv < %{version}-%{release} +Provides: trinity-k3b-i18n-sv = %{version}-%{release} + +%description Swedish This package contains the Swedish translations for K3B. -%package uk +%files Swedish +%defattr(-,root,root,-) +%lang(sv) %{tde_tdedocdir}/HTML/sv/k3b +%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo + +########## + +%package Ukrainian Group: Applications/Archiving Requires: trinity-k3b Summary: Ukrainian (uk) translations for K3B [Trinity] -%description uk + +Obsoletes: trinity-k3b-i18n-uk < %{version}-%{release} +Provides: trinity-k3b-i18n-uk = %{version}-%{release} + +%description Ukrainian This package contains the Ukrainian translations for K3B. +%files Ukrainian +%defattr(-,root,root,-) +%lang(uk) %{tde_tdedocdir}/HTML/uk/k3b +%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo + +########## %prep %setup -q -n %{name}-%{tde_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" @@ -192,6 +348,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__make %{?_smp_mflags} + %install %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -242,78 +399,6 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__rm -rf %{buildroot} -%files da -%defattr(-,root,root,-) -%lang(da) %{tde_tdedocdir}/HTML/da/k3b -%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo - -%files de -%defattr(-,root,root,-) -%lang(de) %{tde_tdedocdir}/HTML/de/k3b -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo - -%files el -%defattr(-,root,root,-) -#%lang(el) %{tde_tdedocdir}/HTML/el/k3b -%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo - -%files es -%defattr(-,root,root,-) -%lang(es) %{tde_tdedocdir}/HTML/es/k3b -%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo - -%files et -%defattr(-,root,root,-) -%lang(et) %{tde_tdedocdir}/HTML/et/k3b -%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo - -%files fr -%defattr(-,root,root,-) -%lang(fr) %{tde_tdedocdir}/HTML/fr/k3b -%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo - -%files it -%defattr(-,root,root,-) -%lang(it) %{tde_tdedocdir}/HTML/it/k3b -%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo - -%files nl -%defattr(-,root,root,-) -%lang(nl) %{tde_tdedocdir}/HTML/nl/k3b -%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo - -%files pl -%defattr(-,root,root,-) -%lang(pl) %{tde_tdedocdir}/HTML/pl/k3b -%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo - -%files pt -%defattr(-,root,root,-) -%lang(pt) %{tde_tdedocdir}/HTML/pt/k3b -%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo - -%files ptbr -%defattr(-,root,root,-) -%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/k3b -%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo - -%files ru -%defattr(-,root,root,-) -%lang(ru) %{tde_tdedocdir}/HTML/ru/k3b -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo - -%files sv -%defattr(-,root,root,-) -%lang(sv) %{tde_tdedocdir}/HTML/sv/k3b -%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo - -%files uk -%defattr(-,root,root,-) -%lang(uk) %{tde_tdedocdir}/HTML/uk/k3b -%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo - - - %changelog * Fri Jul 05 2013 Francois Andriot - 1.0.5-4 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec index dd5878e7e..42184a43c 100644 --- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec +++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec @@ -72,7 +72,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : %postun -n trinity-kcontrol-ldap-bonding touch --no-create %{tde_datadir}/icons/hicolor || : -%files -n trinity-kcontrol-ldap-bonding -f %{tde_pkg}.lang +%files -n trinity-kcontrol-ldap-bonding %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/tdeldapbonding @@ -98,7 +98,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : %postun -n trinity-tde-ldap-cert-updater touch --no-create %{tde_datadir}/icons/hicolor || : -%files -n trinity-tde-ldap-cert-updater -f %{tde_pkg}.lang +%files -n trinity-tde-ldap-cert-updater %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/tdeldapcertupdater @@ -141,8 +141,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec index 12afa5925..9aee80f36 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec @@ -70,7 +70,7 @@ update-desktop-database %{tde_tdeappdir} > /dev/null %postun -n trinity-kcontrol-ldap-controller update-desktop-database %{tde_tdeappdir} > /dev/null -%files -n trinity-kcontrol-ldap-controller -f %{tde_pkg}.lang +%files -n trinity-kcontrol-ldap-controller %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/primaryrccertupdater @@ -121,8 +121,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec index 45c0c9e1b..dec203b63 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec @@ -70,7 +70,7 @@ update-desktop-database %{tde_tdeappdir} > /dev/null %postun -n trinity-kcontrol-ldap-manager update-desktop-database %{tde_tdeappdir} > /dev/null -%files -n trinity-kcontrol-ldap-manager -f %{tde_pkg}.lang +%files -n trinity-kcontrol-ldap-manager %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/tdeldapmanager @@ -116,8 +116,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray-14.0.0.spec index dfca0749f..eb772fad6 100644 --- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec +++ b/redhat/applications/kerberostray/kerberostray-14.0.0.spec @@ -89,8 +89,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index c3cd3d09a..ef3690e8f 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -109,8 +109,8 @@ with the K Desktop Environment version 3. ./autogen.sh # Fix Q_OBJECT => TQ_OBJECT -#%__sed -i src/*/*/*.h src/*/*/*.sh \ -# -e "s|Q_OBJECT|TQ_OBJECT|" +%__sed -i src/*/*/*.h src/*/*/*.sh \ + -e "s|Q_OBJECT|TQ_OBJECT|" %build diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec index c4cbbf333..53303d743 100644 --- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec +++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec @@ -75,8 +75,13 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +if [ -x "%{_libdir}/qt4/bin/qmake" ]; then + export PATH="%{_libdir}/qt4/bin:${PATH}" +fi + # Use QT4's qmake -%{_bindir}/qmake +qmake + # Not SMP SAFE ! %__make diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec index e09752d31..d2565fa5a 100644 --- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec +++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec @@ -68,7 +68,7 @@ BuildRequires: jack-audio-connection-kit-devel %endif # LIRC support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 %define with_lirc 1 BuildRequires: lirc-devel %endif diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec index 66308d351..fabd6739c 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec @@ -105,7 +105,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ --disable-rpath \ - --with-extra-includes=:/usr/include/cdda \ + --with-extra-includes=/usr/include/cdda \ --enable-closure %__make %{?_smp_mflags} diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec index cb5785496..2fbfd2f92 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec @@ -155,8 +155,6 @@ export PATH="%{_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build -%find_lang kdesvn - # Installs SVN protocols as alternatives %__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn @@ -209,7 +207,7 @@ fi /sbin/ldconfig || : -%files -f kdesvn.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_bindir}/tdesvn -- cgit v1.2.1