diff options
| -rw-r--r-- | redhat/applications/adept/adept-14.0.0.spec | 2 | ||||
| -rw-r--r-- | redhat/applications/fusion-icon/fusion-icon.spec | 15 | ||||
| -rw-r--r-- | redhat/applications/kbarcode/kbarcode-14.0.0.spec | 87 | ||||
| -rw-r--r-- | redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec | 1 | ||||
| -rw-r--r-- | redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec | 2 | ||||
| -rwxr-xr-x | redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 4 | ||||
| -rw-r--r-- | redhat/packages.el7 | 3 | ||||
| -rw-r--r-- | redhat/tdeartwork/tdeartwork-14.0.0.spec | 5 | ||||
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch | 10 |
9 files changed, 75 insertions, 54 deletions
diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec index b271314ce..2ba208ff8 100644 --- a/redhat/applications/adept/adept-14.0.0.spec +++ b/redhat/applications/adept/adept-14.0.0.spec @@ -168,7 +168,7 @@ export PATH="%{tde_bindir}:${PATH}" --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ \ - --disable-rpath \ + --enable-rpath \ --enable-closure \ \ --with-extra-includes=%{_includedir}/tqt3 \ diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec index 6580ca75b..729590bfe 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/fusion-icon/fusion-icon.spec @@ -1,5 +1,6 @@ # Default version for this component -%define kdecomp fusion-icon +%define tde_pkg fusion-icon +%define tde_version 14.0.0 %if "%{?python2_sitelib}" == "" %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") @@ -11,7 +12,7 @@ %define _variant .opt %endif -# TDE 3.5.13 specific building variables +# TDE specific building variables %define tde_bindir %{tde_prefix}/bin %define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc @@ -27,7 +28,7 @@ %define _docdir %{tde_docdir} -Name: trinity-%{kdecomp} +Name: trinity-%{tde_pkg} Summary: tray icon to launch and manage Compiz Fusion [Trinity] Version: 0.0.0+git20071028 Release: 2%{?dist}%{?_variant} @@ -42,7 +43,7 @@ URL: http://www.trinitydesktop.org/ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{kdecomp}-3.5.13.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # [fusion-icon] Allow python installation under /usr instead of tde_prefix Patch1: fusion-icon-3.5.13-fix_python_sitelib.patch @@ -65,12 +66,12 @@ decorators. %prep -%setup -q -n applications/%{kdecomp} -%patch1 -p1 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" diff --git a/redhat/applications/kbarcode/kbarcode-14.0.0.spec b/redhat/applications/kbarcode/kbarcode-14.0.0.spec index 064a1402a..5f122bd1a 100644 --- a/redhat/applications/kbarcode/kbarcode-14.0.0.spec +++ b/redhat/applications/kbarcode/kbarcode-14.0.0.spec @@ -23,11 +23,12 @@ %define _docdir %{tde_docdir} +########## Name: trinity-%{tde_pkg} Summary: barcode and label printing application for Trinity -Version: 2.0.6 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Version: 2.0.7 +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -50,6 +51,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext +Requires: %{name}-tdefile-plugin = %{version}-%{release} + %description KBarcode is a barcode and label printing application for Trinity. It can be used @@ -70,11 +73,57 @@ supported. Even complex 2D barcodes are supported using third party tools. The generated barcodes can be directly printed or you can export them into images to use them in another application. +%post +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null + +%postun +touch --no-create %{tde_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +update-desktop-database %{tde_appdir} &> /dev/null + +%files -f %{tde_pkg}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_bindir}/kbarcode +%{tde_tdeappdir}/kbarcode-batch.desktop +%{tde_tdeappdir}/kbarcode-editor.desktop +%{tde_tdeappdir}/kbarcode-single.desktop +%{tde_tdeappdir}/kbarcode.desktop +%{tde_datadir}/mimelnk/application/kbarcode-label.desktop +%{tde_datadir}/apps/kbarcode/ +%{tde_datadir}/icons/hicolor/*/actions/barcode.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png +%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png +%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png +%{tde_tdedocdir}/HTML/en/kbarcode/ + +########## + +%package tdefile-plugin +Summary: tdefile-plugin for %{name} +Group: Applications/Utilities +#Requires: %{name} = %{version}-%{release} + +%description tdefile-plugin +%{summary}. + +%files tdefile-plugin +%defattr(-,root,root,-) +%{tde_tdelibdir}/tdefile_kbarcode.la +%{tde_tdelibdir}/tdefile_kbarcode.so +%{tde_datadir}/services/tdefile_kbarcode.desktop + +########## %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -87,7 +136,6 @@ to use them in another application. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ @@ -125,39 +173,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_appdir} &> /dev/null - - -%files -f %{tde_pkg}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_bindir}/kbarcode -%{tde_tdelibdir}/tdefile_kbarcode.la -%{tde_tdelibdir}/tdefile_kbarcode.so -%{tde_tdeappdir}/kbarcode-batch.desktop -%{tde_tdeappdir}/kbarcode-editor.desktop -%{tde_tdeappdir}/kbarcode-single.desktop -%{tde_tdeappdir}/kbarcode.desktop -%{tde_datadir}/mimelnk/application/kbarcode-label.desktop -%{tde_datadir}/apps/kbarcode/ -%{tde_datadir}/icons/hicolor/*/actions/barcode.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodeellipse.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodegrid.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcodelinetool.png -%{tde_datadir}/icons/hicolor/*/actions/kbarcoderect.png -%{tde_datadir}/icons/hicolor/*/apps/kbarcode.png -%{tde_datadir}/services/tdefile_kbarcode.desktop -%{tde_tdedocdir}/HTML/en/kbarcode/ - - %changelog * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.6-5 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec index 3ec4289db..2220b3cc1 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec @@ -553,7 +553,6 @@ Provides: %{name}-tz_TW = %{version}-%{release} %build export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export kde_htmldir="%{tde_tdedocdir}/HTML" diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec index a18b76755..a1c97922e 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec @@ -176,7 +176,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/services/tdenetman_pptp.desktop %{tde_datadir}/services/tdenetman_strongswan.desktop %{tde_datadir}/services/tdenetman_vpnc.desktop - +%{tde_tdedocdir}/HTML/en/tdenetworkmanager/ %files devel %defattr(-,root,root,-) diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 28ddd68b9..603f70ebc 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -135,8 +135,8 @@ fi -DWITH_GCC_VISIBILITY=OFF \ \ -DQTDIR="%{tde_datadir}/tqt3" \ - -DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \ - -DQT_LIBRARY_DIRS="%{tde_libdir}" \ + -DQT_INCLUDE_DIR="%{tde_includedir}/tqt3" \ + -DQT_LIBRARY_DIR="%{tde_libdir}" \ \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ diff --git a/redhat/packages.el7 b/redhat/packages.el7 index 980c35452..eca5edaba 100644 --- a/redhat/packages.el7 +++ b/redhat/packages.el7 @@ -35,6 +35,7 @@ ffmpeg-devel fftw-devel file-devel flac-devel +flex-devel fontpackages-devel fribidi-devel gamin-devel @@ -80,6 +81,7 @@ libart_lgpl-devel libblkid-devel libcap-devel libcdio-devel +libcdio-paranoia-devel libconfig-devel libcurl-devel libdvdread-devel @@ -162,4 +164,3 @@ xmlto xorg-x11-font-utils xulrunner-devel xz-devel -libcdio-paranoia-devel diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec index e8c812144..80dcff1ad 100644 --- a/redhat/tdeartwork/tdeartwork-14.0.0.spec +++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec @@ -664,6 +664,11 @@ This package is part of Trinity, and a component of the TDE artwork module. %{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop %endif +%if 0%{?fedora} >= 20 +%{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop +%{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop +%endif + %endif ########## diff --git a/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch b/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch index 8bec27061..a0cb449a4 100644 --- a/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch +++ b/redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch @@ -7,9 +7,9 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsol dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 )); - dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~")); + dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+")); - + dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false)); + dialog->SchemaEditor1->setSchema(config.readEntry("schema")); - diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp 2013-07-10 07:56:40.112802782 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp 2013-07-10 07:58:53.698465376 +0200 @@ -20,8 +20,8 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cp - s_word_seps= config->readEntry("wordseps",":@-./_~"); + s_word_seps= config->readEntry("wordseps",":@-./_~+"); b_framevis = config->readBoolEntry("has frame",true); + b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false); TQPtrList<TEWidget> tes = activeTEs(); - for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp 2013-07-10 07:56:40.112802782 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp 2013-07-10 07:58:53.684465202 +0200 @@ -30,10 +30,10 @@ diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_pa n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2); m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE); - s_word_seps= config->readEntry("wordseps",":@-./_~"); -+ s_word_seps= config->readEntry("wordseps",":@-./_~+"); - ++ s_word_seps= config->readEntry("wordseps",":@-./_~+"); n_encoding = config->readNumEntry("encoding",0); + TQFont tmpFont = TDEGlobalSettings::fixedFont(); diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp --- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp 2013-07-10 07:56:40.112802782 +0200 +++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp 2013-07-10 07:58:53.690465276 +0200 |