diff options
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch | 20 | ||||
| -rw-r--r-- | redhat/applications/bibletime/trinity-bibletime.spec | 12 | ||||
| -rwxr-xr-x | redhat/genrpm.sh | 2 | ||||
| -rw-r--r-- | redhat/kdebase/kdebase-3.5.13-kate_mru.patch | 71 | ||||
| -rw-r--r-- | redhat/kdebase/trinity-kdebase-3.5.13.spec | 8 |
5 files changed, 110 insertions, 3 deletions
diff --git a/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch b/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch new file mode 100644 index 000000000..2e5d6db69 --- /dev/null +++ b/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch @@ -0,0 +1,20 @@ +--- clucene.m4.ORI 2011-11-30 19:22:02.284530031 +0100 ++++ clucene.m4 2011-11-30 20:03:45.704532045 +0100 +@@ -28,7 +28,7 @@ + + dnl try to find CLucene library files + AC_MSG_CHECKING([for CLucene library files]) +-ac_clucene_library_dirs="$ac_clucene_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/local/lib" ++ac_clucene_library_dirs="/usr/lib/clucene09 /usr/lib64/clucene09 $ac_clucene_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/local/lib" + + if test "x$ac_static_clucene" = "xYES"; then + SEARCH_LIBS="libclucene.a"; +@@ -62,7 +62,7 @@ + + dnl -- try to find CLucene include files -- + AC_MSG_CHECKING([for Clucene include files]) +-ac_clucene_include_dirs="$ac_clucene_dir/include $exec_prefix/include $prefix/include /usr/include /usr/local/include" ++ac_clucene_include_dirs=" /usr/include/clucene09 $ac_clucene_dir/include $exec_prefix/include $prefix/include /usr/include /usr/local/include" + + AC_CACHE_VAL(ac_cv_clucene_incdir, AC_FIND_FILE(CLucene.h, $ac_clucene_include_dirs, ac_cv_clucene_incdir)) + diff --git a/redhat/applications/bibletime/trinity-bibletime.spec b/redhat/applications/bibletime/trinity-bibletime.spec index d18884140..0c6e8b0d8 100644 --- a/redhat/applications/bibletime/trinity-bibletime.spec +++ b/redhat/applications/bibletime/trinity-bibletime.spec @@ -33,12 +33,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# Fix detection of older versions of clucene in Fedora >= 16 +Patch0: bibletime-3.5.13-clucene_detection.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel BuildRequires: trinity-kdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext +%if 0%{?fedora} >= 16 +BuildRequires: clucene09-core-devel +%else +BuildRequires: clucene-core-devel +%endif + BuildRequires: sword-devel Requires: sword @@ -52,6 +61,7 @@ texts, write own notes, save, print etc.). %prep %setup -q -n applications/%{kdecomp} +%patch0 -p0 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -112,8 +122,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_includedir}/bibletimeinterface.h %{_datadir}/applications/bibletime.desktop %{_datadir}/apps/bibletime -%{tde_docdir}/HTML/en/bibletime/ %{_datadir}/icons/hicolor/*/*/*.png +%{tde_docdir}/HTML/en/bibletime/ %Changelog diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index c16c7ab1f..68a82b470 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -90,7 +90,7 @@ EOF # Specific prefix for installation of some components case "${COMP##*/}" in - "qt3") PREFIX="/usr";; + "qt3"|"libkarma") PREFIX="/usr";; esac # Determines if we are running an i386 or x86_64 distro diff --git a/redhat/kdebase/kdebase-3.5.13-kate_mru.patch b/redhat/kdebase/kdebase-3.5.13-kate_mru.patch new file mode 100644 index 000000000..232835f9e --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-kate_mru.patch @@ -0,0 +1,71 @@ +diff -urN /dev/shm/kdebase/kate/app/kateconfigdialog.cpp /dev/shm/kdebase.new/kate/app/kateconfigdialog.cpp +--- /dev/shm/kdebase/kate/app/kateconfigdialog.cpp 2011-07-09 01:16:52.000000000 -0500 ++++ /dev/shm/kdebase.new/kate/app/kateconfigdialog.cpp 2011-11-29 11:06:22.000000000 -0600 +@@ -112,11 +112,32 @@ + TQWhatsThis::add(cb_fullPath,i18n("If this option is checked, the full document path will be shown in the window caption.")); + connect( cb_fullPath, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + ++ // sort filelist ? ### remove ++ cb_sortFiles = new TQCheckBox(bgStartup); ++ cb_sortFiles->setText(i18n("Sort &files alphabetically in the file list")); ++ cb_sortFiles->setChecked(parent->filelist->sortType() == KateFileList::sortByName); ++ TQWhatsThis::add( cb_sortFiles, i18n( ++ "If this is checked, the files in the file list will be sorted alphabetically.") ); ++ connect( cb_sortFiles, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + + // GROUP with the one below: "Behavior" + bgStartup = new TQButtonGroup( 1, Qt::Horizontal, i18n("&Behavior"), frGeneral ); + lo->addWidget( bgStartup ); + ++ // number of recent files ++ TQHBox *hbNrf = new TQHBox( bgStartup ); ++ TQLabel *lNrf = new TQLabel( i18n("&Number of recent files:"), hbNrf ); ++ sb_numRecentFiles = new TQSpinBox( 0, 1000, 1, hbNrf ); ++ sb_numRecentFiles->setValue( mainWindow->fileOpenRecent->maxItems() ); ++ lNrf->setBuddy( sb_numRecentFiles ); ++ TQString youwouldnotbelieveit ( i18n( ++ "<qt>Sets the number of recent files remembered by Kate.<p><strong>NOTE: </strong>" ++ "If you set this lower than the current value, the list will be truncated and " ++ "some items forgotten.</qt>") ); ++ TQWhatsThis::add( lNrf, youwouldnotbelieveit ); ++ TQWhatsThis::add( sb_numRecentFiles, youwouldnotbelieveit ); ++ connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); ++ + // sync the konsole ? + cb_syncKonsole = new TQCheckBox(bgStartup); + cb_syncKonsole->setText(i18n("Sync &terminal emulator with active document")); +@@ -389,6 +403,11 @@ + + mainWindow->syncKonsole = cb_syncKonsole->isChecked(); + ++ mainWindow->filelist->setSortType(cb_sortFiles->isChecked() ? KateFileList::sortByName : KateFileList::sortByID); ++ ++ config->writeEntry( "Number of recent files", sb_numRecentFiles->value() ); ++ mainWindow->fileOpenRecent->setMaxItems( sb_numRecentFiles->value() ); ++ + fileSelConfigPage->apply(); + + filelistConfigPage->apply(); +diff -urN /dev/shm/kdebase/kate/app/kateconfigdialog.h /dev/shm/kdebase.new/kate/app/kateconfigdialog.h +--- /dev/shm/kdebase/kate/app/kateconfigdialog.h 2010-08-12 17:35:39.000000000 -0500 ++++ /dev/shm/kdebase.new/kate/app/kateconfigdialog.h 2011-11-29 11:09:03.000000000 -0600 +@@ -66,6 +66,8 @@ + + TQCheckBox *cb_fullPath; + TQCheckBox *cb_syncKonsole; ++ TQCheckBox *cb_sortFiles; ++ TQSpinBox *sb_numRecentFiles; + TQCheckBox *cb_modNotifications; + TQCheckBox *cb_saveMetaInfos; + TQSpinBox *sb_daysMetaInfos; +diff -urN /dev/shm/kdebase/kate/app/katemainwindow.cpp /dev/shm/kdebase.new/kate/app/katemainwindow.cpp +--- /dev/shm/kdebase/kate/app/katemainwindow.cpp 2011-07-09 01:16:52.000000000 -0500 ++++ /dev/shm/kdebase.new/kate/app/katemainwindow.cpp 2011-11-29 11:10:05.000000000 -0600 +@@ -412,6 +412,7 @@ + + m_viewManager->setShowFullPath(config->readBoolEntry("Show Full Path in Title", false)); + ++ fileOpenRecent->setMaxItems( config->readNumEntry("Number of recent files", fileOpenRecent->maxItems() ) ); + fileOpenRecent->loadEntries(config, "Recent Files"); + + fileselector->readConfig(config, "fileselector"); diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 5c52d2732..e2a6aeaec 100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 8 +%define release 9 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -74,6 +74,8 @@ Patch12: kdebase-3.5.13-kdm-crypt.patch Patch8: kdebase-3.5.13-startkde_ldpreload.patch ## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch +## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration +Patch13: kdebase-3.5.13-kate_mru.patch # Fedora 15 Theme: "Lovelock" %if 0%{?fedora} == 15 @@ -245,6 +247,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p4 # Applies an optional distro-specific graphical theme %if "%{?tde_bg}" != "" @@ -619,6 +622,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %{_datadir}/cmake/*.cmake %changelog +* Wed Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-9 +- Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244] + * Fri Nov 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-8 - Updates Kickoff menu Fix [TDE Bugs #281, #508] - Adds KDM gcrypt dependency |