summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kuickshow
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-04-23 20:57:21 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-04-23 20:57:21 +0200
commit30d7fc94d230459f9fd573f5f260f795ab151539 (patch)
treea0a9700aebdeb6b2330bbc892d6da8936a9204d0 /redhat/applications/kuickshow
parentf01a421b4fe4d008074832708f24472aa857a48c (diff)
downloadtde-packaging-30d7fc94d230459f9fd573f5f260f795ab151539.tar.gz
tde-packaging-30d7fc94d230459f9fd573f5f260f795ab151539.zip
RPM packaging: update ktorrent, kuickshow, kvirc, kvkbd, kvpnc
Diffstat (limited to 'redhat/applications/kuickshow')
-rw-r--r--redhat/applications/kuickshow/bp000-8712ab46.diff182
-rw-r--r--redhat/applications/kuickshow/bp001-28d9c774.diff226
-rw-r--r--redhat/applications/kuickshow/bp002-bdeb8b3a.diff166
-rw-r--r--redhat/applications/kuickshow/bp003-d97e403f.diff23
-rw-r--r--redhat/applications/kuickshow/kuickshow-14.0.0.spec103
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.12.spec110
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch11
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13.1.spec151
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13.spec156
9 files changed, 73 insertions, 1055 deletions
diff --git a/redhat/applications/kuickshow/bp000-8712ab46.diff b/redhat/applications/kuickshow/bp000-8712ab46.diff
deleted file mode 100644
index 2f7e0b2cf..000000000
--- a/redhat/applications/kuickshow/bp000-8712ab46.diff
+++ /dev/null
@@ -1,182 +0,0 @@
-commit 8712ab46f5d6dc08d2ff6a1e238773adfc5ab85e
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1324253623 -0600
-
- Rename old tq methods that no longer need a unique name
-
-diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
-index d5d3a84..ce85788 100644
---- a/kuickshow/src/aboutwidget.cpp
-+++ b/kuickshow/src/aboutwidget.cpp
-@@ -41,7 +41,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
-
- TQGroupBox *gBox = new TQGroupBox( 1,Qt::Horizontal, this);
- gBox->setGeometry( 10, 10, width()-20, height()-20 );
-- gBox->tqsetAlignment( AlignHCenter );
-+ gBox->setAlignment( AlignHCenter );
- gBox->installEventFilter( this );
-
- gBox->setPalette( TQPalette( TQColor( white ) ) );
-@@ -57,14 +57,14 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name )
-
- TQLabel *authors = new TQLabel("Kuickshow " KUICKSHOWVERSION
- " was brought to you by", gBox);
-- authors->tqsetAlignment( AlignCenter );
-+ authors->setAlignment( AlignCenter );
-
- m_homepage = new KURLWidget("Carsten Pfeiffer", gBox);
- m_homepage->setURL( "http://devel-home.kde.org/~pfeiffer/kuickshow/" );
-- m_homepage->tqsetAlignment( AlignCenter );
-+ m_homepage->setAlignment( AlignCenter );
-
- TQLabel *copy = new TQLabel("(C) 1998-2006", gBox);
-- copy->tqsetAlignment( AlignCenter );
-+ copy->setAlignment( AlignCenter );
-
- ImlibWidget *im = new ImlibWidget( 0L, gBox, "KuickShow Logo" );
- if ( im->loadImage( file ) )
-diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
-index c0bef52..e444605 100644
---- a/kuickshow/src/defaultswidget.cpp
-+++ b/kuickshow/src/defaultswidget.cpp
-@@ -92,7 +92,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
- // --
-
- gbPreview = new TQGroupBox( i18n("Preview"), this );
-- gbPreview->tqsetAlignment( AlignCenter );
-+ gbPreview->setAlignment( AlignCenter );
-
- lbImOrig = new TQLabel( i18n("Original"), gbPreview );
- imOrig = new ImlibWidget( 0L, gbPreview, "original image" );
-diff --git a/kuickshow/src/filecache.cpp b/kuickshow/src/filecache.cpp
-index d68bc89..2fb4f6d 100644
---- a/kuickshow/src/filecache.cpp
-+++ b/kuickshow/src/filecache.cpp
-@@ -68,7 +68,7 @@ TQString FileCache::tempDir()
-
- KTempDir * FileCache::createTempDir()
- {
-- TQString tmpName = TQString::tqfromLatin1( KGlobal::instance()->instanceName() );
-+ TQString tmpName = TQString::fromLatin1( KGlobal::instance()->instanceName() );
- tmpName.append( TQString::number( getpid() ) );
- TQString dirName = locateLocal( "tmp", tmpName );
- KTempDir *dir = new KTempDir( dirName );
-diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
-index 403269b..5f8df74 100644
---- a/kuickshow/src/filewidget.cpp
-+++ b/kuickshow/src/filewidget.cpp
-@@ -448,7 +448,7 @@ void FileWidget::slotFinishedLoading()
- emit finished();
- }
-
--TQSize FileWidget::tqsizeHint() const
-+TQSize FileWidget::sizeHint() const
- {
- return TQSize( 300, 300 );
- }
-diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h
-index 64f1160..8299664 100644
---- a/kuickshow/src/filewidget.h
-+++ b/kuickshow/src/filewidget.h
-@@ -71,7 +71,7 @@ protected:
- virtual bool eventFilter( TQObject *o, TQEvent * );
- virtual void resizeEvent( TQResizeEvent * );
- virtual void activatedMenu( const KFileItem *, const TQPoint& );
-- virtual TQSize tqsizeHint() const;
-+ virtual TQSize sizeHint() const;
-
- private slots:
- void slotReturnPressed( const TQString& text );
-diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
-index f56c7b3..8b195a7 100644
---- a/kuickshow/src/imagewindow.cpp
-+++ b/kuickshow/src/imagewindow.cpp
-@@ -1128,7 +1128,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
- {
- if ( myIsFullscreen || totalScreen )
- {
-- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).width();
-+ return KGlobalSettings::desktopGeometry(topLevelWidget()).width();
- } else
- return Kuick::workArea().width();
- }
-@@ -1137,7 +1137,7 @@ int ImageWindow::desktopWidth( bool totalScreen ) const
- int ImageWindow::desktopHeight( bool totalScreen ) const
- {
- if ( myIsFullscreen || totalScreen ) {
-- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).height();
-+ return KGlobalSettings::desktopGeometry(topLevelWidget()).height();
- } else {
- return Kuick::workArea().height();
- }
-@@ -1146,7 +1146,7 @@ int ImageWindow::desktopHeight( bool totalScreen ) const
- TQSize ImageWindow::maxImageSize() const
- {
- if ( myIsFullscreen ) {
-- return KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
-+ return KGlobalSettings::desktopGeometry(topLevelWidget()).size();
- }
- else {
- return Kuick::workArea().size() - Kuick::frameSize( winId() );
-@@ -1193,7 +1193,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
- if ( !ImlibWidget::canZoomTo( newWidth, newHeight ) )
- return false;
-
-- TQSize desktopSize = KGlobalSettings::desktopGeometry(tqtopLevelWidget()).size();
-+ TQSize desktopSize = KGlobalSettings::desktopGeometry(topLevelWidget()).size();
-
- int desktopArea = desktopSize.width() * desktopSize.height();
- int imageArea = newWidth * newHeight;
-diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
-index 4e0aa57..b20606a 100644
---- a/kuickshow/src/kuickfile.cpp
-+++ b/kuickshow/src/kuickfile.cpp
-@@ -94,7 +94,7 @@ bool KuickFile::download()
- return m_job != 0L;
- }
-
--KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent )
-+KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
- {
- if ( isAvailable() )
- return OK;
-@@ -152,7 +152,7 @@ void KuickFile::slotResult( KIO::Job *job )
-
- TQString canceledFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
- TQFile::remove( canceledFile );
-- m_progress->tqtopLevelWidget()->hide();
-+ m_progress->topLevelWidget()->hide();
- }
- else {
- m_localFile = static_cast<KIO::FileCopyJob*>(job)->destURL().path();
-@@ -162,7 +162,7 @@ void KuickFile::slotResult( KIO::Job *job )
- m_progress->setProgress( 100 );
- #define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2)
- if ( KDE::version() <= BUGGY_VERSION ) {
-- m_progress->tqtopLevelWidget()->hide(); // ### workaround broken KProgressDialog
-+ m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog
- }
- }
- }
-diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h
-index af92355..49ee389 100644
---- a/kuickshow/src/kuickfile.h
-+++ b/kuickshow/src/kuickfile.h
-@@ -27,7 +27,7 @@ class KuickFile : public TQObject
- TQ_OBJECT
-
- public:
-- enum DownloadtqStatus
-+ enum DownloadStatus
- {
- OK = 1,
- CANCELED,
-@@ -72,7 +72,7 @@ public:
- * immediately.
- * @return true when the download has finished or false when the user aborted the dialog
- */
-- KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent );
-+ KuickFile::DownloadStatus waitForDownload( TQWidget *parent );
-
- // bool needsDownload();
-
diff --git a/redhat/applications/kuickshow/bp001-28d9c774.diff b/redhat/applications/kuickshow/bp001-28d9c774.diff
deleted file mode 100644
index e64d68695..000000000
--- a/redhat/applications/kuickshow/bp001-28d9c774.diff
+++ /dev/null
@@ -1,226 +0,0 @@
-commit 28d9c77436d5cb4c91db8f137f8fe45d4d835527
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1324316391 -0600
-
- Remove additional unneeded tq method conversions
-
-diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp
-index ce85788..dc43578 100644
---- a/kuickshow/src/aboutwidget.cpp
-+++ b/kuickshow/src/aboutwidget.cpp
-@@ -84,7 +84,7 @@ bool AboutWidget::eventFilter( TQObject *o, TQEvent *e )
- {
- if ( e->type() == TQEvent::MouseButtonPress ) {
- TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
-- if ( !m_homepage->tqgeometry().contains( ev->pos() ) ) {
-+ if ( !m_homepage->geometry().contains( ev->pos() ) ) {
- deleteLater();
- return true;
- }
-diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
-index 8b195a7..12aa911 100644
---- a/kuickshow/src/imagewindow.cpp
-+++ b/kuickshow/src/imagewindow.cpp
-@@ -310,8 +310,8 @@ void ImageWindow::updateGeometry( int imWidth, int imHeight )
-
- TQString caption = i18n( "Filename (Imagewidth x Imageheight)",
- "%3 (%1 x %2)" );
-- caption = caption.tqarg( m_kuim->originalWidth() ).
-- tqarg( m_kuim->originalHeight() ).tqarg( m_kuim->url().prettyURL() );
-+ caption = caption.arg( m_kuim->originalWidth() ).
-+ arg( m_kuim->originalHeight() ).arg( m_kuim->url().prettyURL() );
- setCaption( kapp->makeStdCaption( caption ) );
- }
-
-@@ -403,7 +403,7 @@ void ImageWindow::scrollImage( int x, int y, bool restrict )
- // XUnmapWindow();
- // XSetWindowBackgroundPixmap()
- // resize window to fit image size, center image
--// XClearWindow(); // tqrepaint
-+// XClearWindow(); // repaint
- // XMapWindow(), XSync();
- //
- bool ImageWindow::showNextImage( const KURL& url )
-@@ -412,7 +412,7 @@ bool ImageWindow::showNextImage( const KURL& url )
- switch ( file->waitForDownload( this ) ) {
- case KuickFile::ERROR:
- {
-- TQString tmp = i18n("Unable to download the image from %1.").tqarg(url.prettyURL());
-+ TQString tmp = i18n("Unable to download the image from %1.").arg(url.prettyURL());
- emit sigImageError( file, tmp );
- return false;
- }
-@@ -430,7 +430,7 @@ bool ImageWindow::showNextImage( KuickFile *file )
- if ( !loadImage( file ) ) {
- TQString tmp = i18n("Unable to load the image %1.\n"
- "Perhaps the file format is unsupported or "
-- "your Imlib is not installed properly.").tqarg(file->url().prettyURL());
-+ "your Imlib is not installed properly.").arg(file->url().prettyURL());
- emit sigImageError( file, tmp );
- return false;
- }
-@@ -1203,7 +1203,7 @@ bool ImageWindow::canZoomTo( int newWidth, int newHeight )
- return KMessageBox::warningContinueCancel(
- this,
- i18n("You are about to view a very large image (%1 x %2 pixels), which can be very resource-consuming and even make your computer hang.\nDo you want to continue?")
-- .tqarg( newWidth ).tqarg( newHeight ),
-+ .arg( newWidth ).arg( newHeight ),
- TQString(),
- KStdGuiItem::cont(),
- "ImageWindow_confirm_very_large_window"
-diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
-index f42e6c1..0bca327 100644
---- a/kuickshow/src/imlibwidget.cpp
-+++ b/kuickshow/src/imlibwidget.cpp
-@@ -475,7 +475,7 @@ void ImlibWidget::setBackgroundColor( const TQColor& color )
- {
- myBackgroundColor = color;
- setPalette( TQPalette( myBackgroundColor ));
-- tqrepaint( false); // FIXME - false? necessary at all?
-+ repaint( false); // FIXME - false? necessary at all?
- }
-
- const TQColor& ImlibWidget::backgroundColor() const
-@@ -515,7 +515,7 @@ void ImlibWidget::setBusyCursor()
-
- void ImlibWidget::restoreCursor()
- {
-- if ( cursor().shape() == KCursor::waitCursor().tqshape() ) // only if nobody changed the cursor in the meantime!
-+ if ( cursor().shape() == KCursor::waitCursor().shape() ) // only if nobody changed the cursor in the meantime!
- setCursor( m_oldCursor );
- }
-
-diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
-index b20606a..247e56a 100644
---- a/kuickshow/src/kuickfile.cpp
-+++ b/kuickshow/src/kuickfile.cpp
-@@ -106,8 +106,8 @@ KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent )
-
- KProgressDialog *dialog = new KProgressDialog( parent );
- dialog->setModal( true );
-- dialog->setCaption( i18n("Downloading %1...").tqarg( m_url.fileName() ) );
-- dialog->setLabel( i18n("Please wait while downloading\n%1").tqarg( m_url.prettyURL() ));
-+ dialog->setCaption( i18n("Downloading %1...").arg( m_url.fileName() ) );
-+ dialog->setLabel( i18n("Please wait while downloading\n%1").arg( m_url.prettyURL() ));
- dialog->setAllowCancel( true );
- dialog->setAutoClose( true );
-
-diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
-index 0392c85..b0879c0 100644
---- a/kuickshow/src/kuickshow.cpp
-+++ b/kuickshow/src/kuickshow.cpp
-@@ -133,7 +133,7 @@ KuickShow::KuickShow( const char *name )
- if ( KMessageBox::warningYesNo(
- this,
- i18n("Do you really want to display this 1 image at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.",
-- "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", numArgs).tqarg(KStdGuiItem::no().plainText()),
-+ "Do you really want to display these %n images at the same time? This might be quite resource intensive and could overload your computer.<br>If you choose %1, only the first image will be shown.", numArgs).arg(KStdGuiItem::no().plainText()),
- i18n("Display Multiple Images?"))
- != KMessageBox::Yes )
- {
-@@ -253,7 +253,7 @@ void KuickShow::initGUI( const KURL& startDir )
- coll, "kuick_print" );
- print->setText( i18n("Print Image...") );
-
-- KAction *configure = new KAction( i18n("Configure %1...").tqarg( KGlobal::instance()->aboutData()->programName() ), "configure",
-+ KAction *configure = new KAction( i18n("Configure %1...").arg( KGlobal::instance()->aboutData()->programName() ), "configure",
- KShortcut(),
- TQT_TQOBJECT(this), TQT_SLOT( configuration() ),
- coll, "kuick_configure" );
-@@ -552,7 +552,7 @@ bool KuickShow::showImage( const KFileItem *fi,
- TQT_TQOBJECT(this), TQT_SLOT (slotTrashCurrentImage (ImageWindow *)));
- if ( s_viewers.count() == 1 && moveToTopLeft ) {
- // we have to move to 0x0 before showing _and_
-- // after showing, otherwise we get some bogus tqgeometry()
-+ // after showing, otherwise we get some bogus geometry()
- m_viewer->move( Kuick::workArea().topLeft() );
- }
-
-@@ -641,7 +641,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *parent)
-
- if (KMessageBox::warningContinueCancel(
- parent,
-- i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()),
-+ i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").arg(item->url().pathOrURL()),
- i18n("Delete File"),
- KStdGuiItem::del(),
- "Kuick_delete_current_image")
-@@ -666,7 +666,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *parent)
-
- if (KMessageBox::warningContinueCancel(
- parent,
-- i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()),
-+ i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").arg(item->url().pathOrURL()),
- i18n("Trash File"),
- KGuiItem(i18n("to trash", "&Trash"),"edittrash"),
- "Kuick_trash_current_image")
-diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
-index 2c78a92..7005bbe 100644
---- a/kuickshow/src/printing.cpp
-+++ b/kuickshow/src/printing.cpp
-@@ -52,7 +52,7 @@ bool Printing::printImage( ImageWindow& imageWin, TQWidget *parent )
-
- KPrinter::addDialogPage( new KuickPrintDialogPage( parent, "kuick page"));
-
-- if ( printer.setup( parent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) )
-+ if ( printer.setup( parent, i18n("Print %1").arg(printer.docName().section('/', -1)) ) )
- {
- KTempFile tmpFile( TQString(), ".png" );
- if ( tmpFile.status() == 0 )
-@@ -109,7 +109,7 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
- bool shrinkToFit = (printer.option( "app-kuickshow-shrinkToFit" ) != f);
- TQSize imagesize = image.size();
- if ( shrinkToFit && (image.width() > w || image.height() > h) ) {
-- imagesize.tqscale( w, h, TQSize::ScaleMin );
-+ imagesize.scale( w, h, TQSize::ScaleMin );
- }
-
-
-@@ -117,28 +117,28 @@ bool Printing::printImageWithTQt( const TQString& filename, KPrinter& printer,
- // align image
- //
- bool ok = false;
-- int tqalignment = printer.option("app-kuickshow-tqalignment").toInt( &ok );
-+ int alignment = printer.option("app-kuickshow-alignment").toInt( &ok );
- if ( !ok )
-- tqalignment = TQt::AlignCenter; // default
-+ alignment = TQt::AlignCenter; // default
-
- int x = 0;
- int y = 0;
-
- // ### need a GUI for this in KuickPrintDialogPage!
-- // x - tqalignment
-- if ( tqalignment & TQt::AlignHCenter )
-+ // x - alignment
-+ if ( alignment & TQt::AlignHCenter )
- x = (w - imagesize.width())/2;
-- else if ( tqalignment & TQt::AlignLeft )
-+ else if ( alignment & TQt::AlignLeft )
- x = 0;
-- else if ( tqalignment & TQt::AlignRight )
-+ else if ( alignment & TQt::AlignRight )
- x = w - imagesize.width();
-
-- // y - tqalignment
-- if ( tqalignment & TQt::AlignVCenter )
-+ // y - alignment
-+ if ( alignment & TQt::AlignVCenter )
- y = (h - imagesize.height())/2;
-- else if ( tqalignment & TQt::AlignTop )
-+ else if ( alignment & TQt::AlignTop )
- y = 0;
-- else if ( tqalignment & TQt::AlignBottom )
-+ else if ( alignment & TQt::AlignBottom )
- y = h - imagesize.height();
-
- //
-@@ -258,7 +258,7 @@ void KuickPrintDialogPage::getOptions( TQMap<TQString,TQString>& opts,
- TQString t = "true";
- TQString f = "false";
-
--// ### opts["app-kuickshow-tqalignment"] = ;
-+// ### opts["app-kuickshow-alignment"] = ;
- opts["app-kuickshow-printFilename"] = m_addFileName->isChecked() ? t : f;
- opts["app-kuickshow-blackwhite"] = m_blackwhite->isChecked() ? t : f;
- opts["app-kuickshow-shrinkToFit"] = m_shrinkToFit->isChecked() ? t : f;
diff --git a/redhat/applications/kuickshow/bp002-bdeb8b3a.diff b/redhat/applications/kuickshow/bp002-bdeb8b3a.diff
deleted file mode 100644
index e293c5601..000000000
--- a/redhat/applications/kuickshow/bp002-bdeb8b3a.diff
+++ /dev/null
@@ -1,166 +0,0 @@
-commit bdeb8b3ad3118b2be6fc62687092753cc12b2976
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1324497974 -0600
-
- Rename obsolete tq methods to standard names
-
-diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
-index e444605..7e94b1b 100644
---- a/kuickshow/src/defaultswidget.cpp
-+++ b/kuickshow/src/defaultswidget.cpp
-@@ -105,13 +105,13 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
- ////////////////
-
-
-- // tqlayout management
-+ // layout management
- TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 0,
-- KDialog::spacingHint(), "main tqlayout" );
-+ KDialog::spacingHint(), "main layout" );
-
-- TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->tqlayout(),
-+ TQVBoxLayout *gbScaleLayout = new TQVBoxLayout( gbScale->layout(),
- KDialog::spacingHint());
-- TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->tqlayout(),
-+ TQVBoxLayout *gbGeometryLayout = new TQVBoxLayout(gbGeometry->layout(),
- KDialog::spacingHint());
- TQGridLayout *gbPreviewLayout = new TQGridLayout(gbPreview, 2, 3, 0,
- KDialog::spacingHint());
-diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
-index 5f8df74..2662df4 100644
---- a/kuickshow/src/filewidget.cpp
-+++ b/kuickshow/src/filewidget.cpp
-@@ -196,7 +196,7 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e )
- }
-
- const TQString& text = k->text();
-- if ( !text.isEmpty() && text.tqunicode()->isPrint() ) {
-+ if ( !text.isEmpty() && text.unicode()->isPrint() ) {
- k->accept();
-
- if ( !m_fileFinder ) {
-diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp
-index bde353d..1308885 100644
---- a/kuickshow/src/generalwidget.cpp
-+++ b/kuickshow/src/generalwidget.cpp
-@@ -36,8 +36,8 @@
- GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
- : TQWidget( parent, name )
- {
-- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-- tqlayout->setSpacing( KDialog::spacingHint() );
-+ TQVBoxLayout *layout = new TQVBoxLayout( this );
-+ layout->setSpacing( KDialog::spacingHint() );
-
- TQPixmap pixmap = UserIcon( "logo" );
- KURLLabel *logo = new KURLLabel( this );
-@@ -50,7 +50,7 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
- connect( logo, TQT_SIGNAL( leftClickedURL( const TQString & ) ),
- TQT_SLOT( slotURLClicked( const TQString & ) ) );
-
-- tqlayout->addWidget( logo, 0, AlignRight );
-+ layout->addWidget( logo, 0, AlignRight );
-
- cbFullscreen = new TQCheckBox( i18n("Fullscreen mode"), this, "boscreen" );
-
-@@ -70,17 +70,17 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
- gridLayout->addWidget( l1, 1, 0 );
- gridLayout->addWidget( editFilter, 1, 1 );
-
-- tqlayout->addWidget( cbFullscreen );
-- tqlayout->addWidget( cbPreload );
-- tqlayout->addWidget( cbLastdir );
-- tqlayout->addLayout( gridLayout );
-+ layout->addWidget( cbFullscreen );
-+ layout->addWidget( cbPreload );
-+ layout->addWidget( cbLastdir );
-+ layout->addLayout( gridLayout );
-
- ////////////////////////////////////////////////////////////////////////
-
- TQVGroupBox *gbox2 = new TQVGroupBox( i18n("Quality/Speed"),
- this, "qualitybox" );
-- tqlayout->addWidget( gbox2 );
-- tqlayout->addStretch();
-+ layout->addWidget( gbox2 );
-+ layout->addStretch();
-
- cbSmoothScale = new TQCheckBox( i18n("Smooth scaling"), gbox2, "smoothscale" );
- cbFastRender = new TQCheckBox( i18n("Fast rendering"), gbox2, "fastrender" );
-diff --git a/kuickshow/src/mainwidget.cpp b/kuickshow/src/mainwidget.cpp
-index d94d332..47b3d83 100644
---- a/kuickshow/src/mainwidget.cpp
-+++ b/kuickshow/src/mainwidget.cpp
-@@ -35,7 +35,7 @@ MainWidget::~MainWidget()
- }
-
-
--// for now, no tqlayout managers
-+// for now, no layout managers
- void MainWidget::resizeEvent( TQResizeEvent * )
- {
- box->resize( width(), height() );
-diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
-index 7005bbe..0d003a0 100644
---- a/kuickshow/src/printing.cpp
-+++ b/kuickshow/src/printing.cpp
-@@ -199,21 +199,21 @@ KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name )
- {
- setTitle( i18n("Image Settings") );
-
-- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-- tqlayout->setMargin( KDialog::marginHint() );
-- tqlayout->setSpacing( KDialog::spacingHint() );
-+ TQVBoxLayout *layout = new TQVBoxLayout( this );
-+ layout->setMargin( KDialog::marginHint() );
-+ layout->setSpacing( KDialog::spacingHint() );
-
- m_addFileName = new TQCheckBox( i18n("Print fi&lename below image"), this);
- m_addFileName->setChecked( true );
-- tqlayout->addWidget( m_addFileName );
-+ layout->addWidget( m_addFileName );
-
- m_blackwhite = new TQCheckBox ( i18n("Print image in &black and white"), this);
- m_blackwhite->setChecked( false );
-- tqlayout->addWidget (m_blackwhite );
-+ layout->addWidget (m_blackwhite );
-
- TQVButtonGroup *group = new TQVButtonGroup( i18n("Scaling"), this );
- group->setRadioButtonExclusive( true );
-- tqlayout->addWidget( group );
-+ layout->addWidget( group );
- // m_shrinkToFit = new TQRadioButton( i18n("Shrink image to &fit, if necessary"), group );
- m_shrinkToFit = new TQCheckBox( i18n("Shrink image to &fit, if necessary"), group );
- m_shrinkToFit->setChecked( true );
-diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp
-index ed2bedc..9727c20 100644
---- a/kuickshow/src/slideshowwidget.cpp
-+++ b/kuickshow/src/slideshowwidget.cpp
-@@ -31,8 +31,8 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name )
- {
- // setTitle( i18n("Slideshow") );
-
-- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
-- tqlayout->setSpacing( KDialog::spacingHint() );
-+ TQVBoxLayout *layout = new TQVBoxLayout( this );
-+ layout->setSpacing( KDialog::spacingHint() );
-
- m_fullScreen = new TQCheckBox( i18n("Switch to &full-screen"), this );
- m_startWithCurrent = new TQCheckBox( i18n("S&tart with current image"), this);
-@@ -48,11 +48,11 @@ SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name )
- m_cycles->setSpecialValueText( i18n("infinite") );
- m_cycles->setRange( 0, 500 );
-
-- tqlayout->addWidget( m_fullScreen );
-- tqlayout->addWidget( m_startWithCurrent );
-- tqlayout->addWidget( m_delayTime );
-- tqlayout->addWidget( m_cycles );
-- tqlayout->addStretch( 1 );
-+ layout->addWidget( m_fullScreen );
-+ layout->addWidget( m_startWithCurrent );
-+ layout->addWidget( m_delayTime );
-+ layout->addWidget( m_cycles );
-+ layout->addStretch( 1 );
-
- loadSettings( *kdata );
- }
diff --git a/redhat/applications/kuickshow/bp003-d97e403f.diff b/redhat/applications/kuickshow/bp003-d97e403f.diff
deleted file mode 100644
index fdce97a10..000000000
--- a/redhat/applications/kuickshow/bp003-d97e403f.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d97e403f9f70425a59f0d3bdbcfd4dd6360fa6e0
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date: 1331655316 -0500
-
- Remove inadvertent renaming. This resolves bug report 863.
-
-diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
-index 39af7f5..51367f2 100644
---- a/kuickshow/src/imagewindow.cpp
-+++ b/kuickshow/src/imagewindow.cpp
-@@ -182,10 +182,10 @@ void ImageWindow::setupActions()
- TQT_TQOBJECT(this), TQT_SLOT( rotate270() ),
- m_actions, "rotate270" );
-
-- new KAction( i18n("FlipQt::Horizontally"), Key_Asterisk,
-+ new KAction( i18n("Flip Horizontally"), Key_Asterisk,
- TQT_TQOBJECT(this), TQT_SLOT( flipHoriz() ),
- m_actions, "flip_horicontally" );
-- new KAction( i18n("FlipQt::Vertically"), Key_Slash,
-+ new KAction( i18n("Flip Vertically"), Key_Slash,
- TQT_TQOBJECT(this), TQT_SLOT( flipVert() ),
- m_actions, "flip_vertically" );
-
diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
index 1a43024fb..c0eb06fdd 100644
--- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec
+++ b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
@@ -1,68 +1,108 @@
-# Default version for this component
-%define tde_pkg kuickshow
+#
+# spec file for package kuickshow (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
%define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg kuickshow
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
-
-Name: trinity-%{tde_pkg}
-Summary: Quick picture viewer for TDE
-Version: 0.8.13
-Release: %{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
+Name: trinity-%{tde_pkg}
+Epoch: %{tde_epoch}
+Version: 0.8.13
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary: Quick picture viewer for TDE
+Group: Applications/Utilities
+URL: http://www.trinitydesktop.org/
-License: GPLv2+
-Group: Applications/Utilities
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
+%endif
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion}
+BuildRequires: autoconf automake libtool m4
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# IMLIB1 support
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: imlib-devel
%endif
-%if 0%{?suse_version} || 0%{?mgaversion}
+%if 0%{?mgaversion}
BuildRequires: imlib1-devel
%endif
+# GIF support
+%if 0%{?suse_version}
+BuildRequires: giflib-devel
+%else
+BuildRequires: libungif-devel
+%endif
+
+
%description
Kuickshow is a picture viewer for TDE. It displays the directory structure,
displaying images as thumbnails.
Clicking on an image shows the image in its normal size.
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
+##########
+
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -101,6 +141,9 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{?buildroot}
+# Missing category will make this fail.
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+
%clean
%__rm -rf %{buildroot}
@@ -131,5 +174,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.13-9
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.8.13-1
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.12.spec b/redhat/applications/kuickshow/kuickshow-3.5.12.spec
deleted file mode 100644
index 658222daf..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.12.spec
+++ /dev/null
@@ -1,110 +0,0 @@
-# Default version for this component
-%define kdecomp kuickshow
-%define version 0.8.13
-%define release 2
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{tde_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{tde_includedir}/kde
-%define tde_libdir %{tde_libdir}/kde3
-
-
-Name: trinity-%{kdecomp}
-Summary: Quick picture viewer for KDE
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-Source0: %{kdecomp}-3.5.12.tar.gz
-
-Conflicts: trinity-kdegraphics
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: imlib-devel
-
-%description
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_tdedocdir}/HTML/en/*/
-%{tde_datadir}/icons/*/*/*/*
-%{tde_libdir}/libkdeinit_%{kdecomp}.so
-
-%exclude %{tde_libdir}/*.la
-%exclude %{tde_libdir}/*/*.so
-%exclude %{tde_libdir}/*/*.la
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch b/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch
deleted file mode 100644
index 8028d1941..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kuickshow/kuickshow/src/Makefile.am.ORI 2012-08-06 11:35:57.271341272 +0200
-+++ kuickshow/kuickshow/src/Makefile.am 2012-08-06 11:36:20.916830749 +0200
-@@ -10,7 +10,7 @@
- METASOURCES = AUTO
-
- kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
--kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB)
-+kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
- kuickshow_la_SOURCES = kuickshow.cpp \
- aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp \
- defaultswidget.cpp imagewindow.cpp kuickdata.cpp \
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec
deleted file mode 100644
index ca085bf1d..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.1.spec
+++ /dev/null
@@ -1,151 +0,0 @@
-# Default version for this component
-%define kdecomp kuickshow
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: Quick picture viewer for KDE
-Version: 0.8.13
-Release: 5%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.1.tar.gz
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: imlib-devel
-%endif
-
-%description
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
- -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/lib[kt]deinit_%{kdecomp}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/*/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-5
-- Initial release for TDE 3.5.13.1
-
-* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Removes conflict with 'kdegraphics'
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Rename old tq methods that no longer need a unique name [Commit #8712ab46]
-- Remove additional unneeded tq method conversions [Commit #28d9c774]
-- Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
-- Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13.spec b/redhat/applications/kuickshow/kuickshow-3.5.13.spec
deleted file mode 100644
index 6602f889f..000000000
--- a/redhat/applications/kuickshow/kuickshow-3.5.13.spec
+++ /dev/null
@@ -1,156 +0,0 @@
-# Default version for this component
-%define kdecomp kuickshow
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE 3.5.13 specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{kdecomp}
-Summary: Quick picture viewer for KDE
-Version: 0.8.13
-Release: 4%{?dist}%{?_variant}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{kdecomp}-3.5.13.tar.gz
-
-# [kuickshow] Rename old tq methods that no longer need a unique name [Commit #8712ab46]
-Patch0: bp000-8712ab46.diff
-# [kuickshow] Remove additional unneeded tq method conversions [Commit #28d9c774]
-Patch1: bp001-28d9c774.diff
-# [kuickshow] Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
-Patch2: bp002-bdeb8b3a.diff
-# [kuickshow] Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
-Patch3: bp003-d97e403f.diff
-# [kuickshow] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
-Patch4: kuickshow-3.5.13-missing_ldflags.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-tdelibs-devel
-BuildRequires: trinity-tdebase-devel
-BuildRequires: desktop-file-utils
-BuildRequires: imlib-devel
-
-%description
-Kuickshow is a picture viewer for KDE. It displays the directory structure,
-displaying images as thumbnails.
-Clicking on an image shows the image in its normal size.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1 -b .ldflags
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
- -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
- -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
- --disable-rpath \
- --with-extra-includes=%{tde_includedir}/tqt \
- --enable-closure
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{?buildroot}
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/*
-%{tde_datadir}/applications/*/*.desktop
-%{tde_datadir}/apps/*/
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_libdir}/lib[kt]deinit_%{kdecomp}.so
-%{tde_libdir}/*.la
-%{tde_tdelibdir}/*.so
-%{tde_tdelibdir}/*.la
-%{tde_tdedocdir}/HTML/en/*/
-
-
-%Changelog
-* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Removes conflict with 'kdegraphics'
-
-* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
-- Rename old tq methods that no longer need a unique name [Commit #8712ab46]
-- Remove additional unneeded tq method conversions [Commit #28d9c774]
-- Rename obsolete tq methods to standard names [Commit #bdeb8b3a]
-- Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
-
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-2
-- Import to GIT
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-1
-- Correct macro to install under "/opt", if desired
-
-* Sat Aug 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.13-0
-- Initial release for RHEL 6.0
-