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 packages

Browse Source
pull/3/head
François Andriot 11 years ago
parent 9a6db048ad
commit 9ebddd3f9a
5 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File

18
redhat/applications/koffice/koffice-14.0.0.spec
Unescape View File

@ -55,7 +55,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: koffice-14.0.0-ftbfs.patch #Patch0: koffice-14.0.0-ftbfs.patch
# BuildRequires: world-devel ;) # BuildRequires: world-devel ;)
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@ -1063,7 +1063,7 @@ This package is part of the TDE Office Suite.
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs #patch0 -p1 -b .ftbfs
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__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" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -1111,20 +1111,6 @@ export CXXFLAGS="${CXXFLAGS} -I${RD}/%_normalized_cpu-linux"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# Replace absolute symlinks with relative ones
pushd %{buildroot}%{tde_tdedocdir}/HTML
for lang in *; do
if [ -d $lang ]; then
pushd $lang
for i in */*; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
done
popd
fi
done
popd
## unpackaged files ## unpackaged files
# fonts # fonts
rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/ rm -rfv %{buildroot}%{tde_datadir}/apps/kformula/fonts/

4
redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
Unescape View File

@ -40,7 +40,7 @@ Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: tdepowersave-14.0.0-test.patch #Patch0: tdepowersave-14.0.0-test.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-arts-devel >= 1:1.5.10
@ -88,7 +88,7 @@ settings for:
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .test #patch0 -p1 -b .test
%build %build

32
redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch
Unescape View File

@ -7,26 +7,26 @@
+ void slotVibrateUnlock( bool ); + void slotVibrateUnlock( bool );
void slotUseUnmanagedLockWindows( bool ); void slotUseUnmanagedLockWindows( bool );
void slotHideActiveWindowsFromSaver( bool ); void slotHideActiveWindowsFromSaver( bool );
void processLockouts(); void slotHideCancelButton( bool );
@@ -101,6 +102,7 @@ @@ -102,6 +103,7 @@
TQGroupBox *mSettingsGroup; TQGroupBox *mSettingsGroup;
TQCheckBox *mDelaySaverStartCheckBox; TQCheckBox *mDelaySaverStartCheckBox;
TQCheckBox *mUseTSAKCheckBox; TQCheckBox *mUseTSAKCheckBox;
+ TQCheckBox *mVibrateUnlockCheckBox; + TQCheckBox *mVibrateUnlockCheckBox;
TQCheckBox *mUseUnmanagedLockWindowsCheckBox; TQCheckBox *mUseUnmanagedLockWindowsCheckBox;
TQCheckBox *mHideActiveWindowsFromSaverCheckBox; TQCheckBox *mHideActiveWindowsFromSaverCheckBox;
TQCheckBox *mHideCancelButtonCheckBox;
@@ -119,6 +121,7 @@ @@ -121,6 +123,7 @@
bool mImmutable; bool mImmutable;
bool mDelaySaverStart; bool mDelaySaverStart;
bool mUseTSAK; bool mUseTSAK;
+ bool mVibrateUnlock; + bool mVibrateUnlock;
bool mUseUnmanagedLockWindows; bool mUseUnmanagedLockWindows;
bool mHideActiveWindowsFromSaver; bool mHideActiveWindowsFromSaver;
bool mHideCancelButton;
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp.vibrate_dialog 2013-04-26 22:15:23.000000000 +0200 --- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp.vibrate_dialog 2013-04-26 22:15:23.000000000 +0200
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp 2013-05-14 22:24:37.354375502 +0200 +++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp 2013-05-14 22:24:37.354375502 +0200
@@ -270,6 +270,13 @@ @@ -271,6 +271,13 @@
settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1); settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") ); TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
@ -37,26 +37,26 @@
+ settingsGroupLayout->addWidget(mVibrateUnlockCheckBox, 4, 1); + settingsGroupLayout->addWidget(mVibrateUnlockCheckBox, 4, 1);
+ TQWhatsThis::add( mVibrateUnlockCheckBox, i18n("Makes the unlock dialog box vibrate when entering an incorrect password.") ); + TQWhatsThis::add( mVibrateUnlockCheckBox, i18n("Makes the unlock dialog box vibrate when entering an incorrect password.") );
+ +
// right column mHideCancelButtonCheckBox = new TQCheckBox( i18n("&Hide Cancel &button"), mSettingsGroup );
TQBoxLayout* rightColumnLayout = new TQVBoxLayout(topLayout, KDialog::spacingHint()); mHideCancelButtonCheckBox->setEnabled( true );
mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
@@ -429,6 +436,7 @@ @@ -437,6 +444,7 @@
mLock = config->readBoolEntry("Lock", false); mLock = config->readBoolEntry("Lock", false);
mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true); mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true);
mUseTSAK = config->readBoolEntry("UseTDESAK", true); mUseTSAK = config->readBoolEntry("UseTDESAK", true);
+ mVibrateUnlock = config->readBoolEntry("VibrateUnlock", true); + mVibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false); mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);
mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true); mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);
mSaver = config->readEntry("Saver"); mHideCancelButton = config->readBoolEntry("HideCancelButton", false);
@@ -481,6 +489,7 @@ @@ -490,6 +498,7 @@
config->writeEntry("Lock", mLock); config->writeEntry("Lock", mLock);
config->writeEntry("DelaySaverStart", mDelaySaverStart); config->writeEntry("DelaySaverStart", mDelaySaverStart);
config->writeEntry("UseTDESAK", mUseTSAK); config->writeEntry("UseTDESAK", mUseTSAK);
+ config->writeEntry("VibrateUnlock", mVibrateUnlock); + config->writeEntry("VibrateUnlock", mVibrateUnlock);
config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows); config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);
config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver); config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);
config->writeEntry("HideCancelButton", mHideCancelButton);
@@ -688,10 +697,14 @@ @@ -705,10 +714,14 @@
mUseTSAKCheckBox->setChecked( false ); mUseTSAKCheckBox->setChecked( false );
} }
if (!mUseUnmanagedLockWindows) { if (!mUseUnmanagedLockWindows) {
@ -71,7 +71,7 @@
mHideActiveWindowsFromSaverCheckBox->setEnabled( false ); mHideActiveWindowsFromSaverCheckBox->setEnabled( false );
mHideActiveWindowsFromSaverCheckBox->setChecked( false ); mHideActiveWindowsFromSaverCheckBox->setChecked( false );
} }
@@ -936,6 +949,16 @@ @@ -969,6 +982,16 @@
processLockouts(); processLockouts();
mChanged = true; mChanged = true;
emit changed(true); emit changed(true);
@ -178,7 +178,7 @@
// Handle timer events. // Handle timer events.
@@ -442,6 +479,7 @@ @@ -442,6 +479,7 @@
ok->setEnabled(false); ok->setEnabled(false);
cancel->setEnabled(false); //cancel->setEnabled(false);
mNewSessButton->setEnabled( false ); mNewSessButton->setEnabled( false );
+ badPasswordLogin(); + badPasswordLogin();
return; return;

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

@ -76,7 +76,7 @@ Source9: mgabutton.svg
%endif %endif
# Patch party ! # Patch party !
Patch0: tdebase-14.0.0-ftbfs.patch #Patch0: tdebase-14.0.0-ftbfs.patch
# Permanent patches, all TDE versions # Permanent patches, all TDE versions
## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora] ## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora]
@ -2656,6 +2656,7 @@ ever launching another application.
%{tde_datadir}/services/konq_*.desktop %{tde_datadir}/services/konq_*.desktop
%{tde_datadir}/servicetypes/konqaboutpage.desktop %{tde_datadir}/servicetypes/konqaboutpage.desktop
%{tde_tdedocdir}/HTML/en/konqueror/ %{tde_tdedocdir}/HTML/en/konqueror/
%{tde_tdedocdir}/HTML/en/keditbookmarks/
%post -n trinity-konqueror %post -n trinity-konqueror
update-desktop-database %{tde_appdir} 2> /dev/null || : update-desktop-database %{tde_appdir} 2> /dev/null || :
@ -3316,7 +3317,7 @@ Windows and Samba shares.
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs #patch0 -p1 -b .ftbfs
%patch101 -p1 -b .openterminalhere %patch101 -p1 -b .openterminalhere
%patch102 -p1 -b .startmenuicon %patch102 -p1 -b .startmenuicon

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

@ -36,7 +36,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Patch11: tdelibs-14.0.0-displayconfig_crash.patch #Patch11: tdelibs-14.0.0-displayconfig_crash.patch
Patch12: tdelibs-14.0.0-reduce_tdehwlib_cpueagerness.patch Patch12: tdelibs-14.0.0-reduce_tdehwlib_cpueagerness.patch
# Patches from Mandriva # Patches from Mandriva
@ -44,7 +44,7 @@ Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch
Patch102: tdelibs-14.0.0-cups_by_default.patch Patch102: tdelibs-14.0.0-cups_by_default.patch
# Enables the 'kddebug' feature even when built with '-DNDEBUG' # Enables the 'kddebug' feature even when built with '-DNDEBUG'
Patch201: tdelibs-14.0.0-enable_kddebug.patch #Patch201: tdelibs-14.0.0-enable_kddebug.patch
Obsoletes: tdelibs < %{version}-%{release} Obsoletes: tdelibs < %{version}-%{release}
Provides: tdelibs = %{version}-%{release} Provides: tdelibs = %{version}-%{release}
@ -456,7 +456,7 @@ applications for TDE.
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch11 -p1 -b .displayconfigcrash #patch11 -p1 -b .displayconfigcrash
%patch12 -p1 -b .tdehwlib %patch12 -p1 -b .tdehwlib
%patch101 -p1 -b .xdg_path %patch101 -p1 -b .xdg_path

Write Preview
Loading…
Cancel
Save