diff options
Diffstat (limited to 'redhat')
21 files changed, 294 insertions, 515 deletions
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch deleted file mode 100644 index dcdb2ef48..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- kcmautostart/src/autostart.desktop.ORI 2012-05-10 11:47:47.743164035 +0200 -+++ kcmautostart/src/autostart.desktop 2012-05-10 11:49:15.127289325 +0200 -@@ -14,8 +14,10 @@ - Comment=A KControl tool for managing what programs start up with TDE. - Comment[ca]=Panell de control per a gestionar els programes que s'inicien amb la sessió de TDE. - Comment[es]=Panel de control para gestionar los programas que se inician con la sesión de TDE. -+Comment[fr]=Paneau de contrôle pour gérer le démarrage des programmes à l'ouverture de session TDE. - Keywords=autostart manager - Name=Autostart Manager - Name[ca]=Autoengega - Name[es]=Arranque automático -+Name[fr]=Démarrage automatique - Categories=Qt;KDE;X-KDE-settings-components; -diff -Nuar kcmautostart/po.ori//fr.po kcmautostart/po/fr.po ---- kcmautostart/po.ori//fr.po 1970-01-01 01:00:00.000000000 +0100 -+++ kcmautostart/po/fr.po 2012-05-10 19:27:38.107215981 +0200 -@@ -0,0 +1,52 @@ -+msgid "" -+msgstr "" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"PO-Revision-Date: 2012-05-10 12:01+0100\n" -+"Project-Id-Version: autostart_ca\n" -+"Language-Team: <ca@li.org>\n" -+"X-Generator: KBabel 1.11.4\n" -+"MIME-Version: 1.0\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"Last-Translator: Josep Febrer <josep@extens.info>\n" -+ -+#: ../src/autostart.cpp:61 -+msgid "Startup" -+msgstr "Démarrage" -+ -+#: ../src/autostart.cpp:62 -+msgid "Shutdown" -+msgstr "Arrêt" -+ -+#: ../src/autostart.cpp:63 -+msgid "ENV" -+msgstr "ENV" -+ -+#: ../src/autostart.cpp:102 -+msgid "Name" -+msgstr "Nom" -+ -+#: ../src/autostart.cpp:103 -+msgid "Command" -+msgstr "Commande" -+ -+#: ../src/autostart.cpp:104 -+msgid "Run on" -+msgstr "Executer" -+ -+#: ../src/autostart.cpp:129 -+msgid "&Add" -+msgstr "&Ajouter" -+ -+#: ../src/autostart.cpp:131 -+msgid "&Remove" -+msgstr "&Supprimer" -+ -+#: ../src/autostart.cpp:133 -+msgid "&Properties" -+msgstr "&Propiétés" -+ -+#: ../src/autostart.cpp:317 -+msgid "This module helps you configure which applications KDE runs When starting up and shutting down." -+msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE." -+ diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch deleted file mode 100644 index fae431e66..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- kcmautostart.ORI/src/autostart.cpp 2012-05-10 11:36:44.887288951 +0200 -+++ kcmautostart.P/src/autostart.cpp 2012-05-10 11:37:16.701639283 +0200 -@@ -88,10 +88,10 @@ - path = kgs->autostartPath()+"/"; - break; - case Shutdown: -- path = ksd->localtdedir()+"shutdown/"; -+ path = ksd->localkdedir()+"shutdown/"; - break; - case ENV: -- path = ksd->localtdedir()+"env/"; -+ path = ksd->localkdedir()+"env/"; - break; - } - KIO::file_move(fileName, KURL( path + fileName.fileName() )); -@@ -190,9 +190,9 @@ - if (x==0) - path = kgs->autostartPath(); - else if (x==1) -- path = ksd->localtdedir() + "/shutdown"; -+ path = ksd->localkdedir() + "/shutdown"; - else if (x==2) -- path = ksd->localtdedir() + "/env"; -+ path = ksd->localkdedir() + "/env"; - - if (! KStandardDirs::exists(path)) - KStandardDirs::makeDir(path); diff --git a/redhat/applications/kcmautostart/kcmautostart-fr.po b/redhat/applications/kcmautostart/kcmautostart-fr.po deleted file mode 100644 index 6d898bc97..000000000 --- a/redhat/applications/kcmautostart/kcmautostart-fr.po +++ /dev/null @@ -1,52 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2012-05-10 12:01+0100\n" -"Project-Id-Version: autostart_ca\n" -"Language-Team: <ca@li.org>\n" -"X-Generator: KBabel 1.11.4\n" -"MIME-Version: 1.0\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Josep Febrer <josep@extens.info>\n" - -#: ../src/autostart.cpp:61 -msgid "Startup" -msgstr "Démarrage" - -#: ../src/autostart.cpp:62 -msgid "Shutdown" -msgstr "Arrêt" - -#: ../src/autostart.cpp:63 -msgid "ENV" -msgstr "ENV" - -#: ../src/autostart.cpp:102 -msgid "Name" -msgstr "Nom" - -#: ../src/autostart.cpp:103 -msgid "Command" -msgstr "Comande" - -#: ../src/autostart.cpp:104 -msgid "Run on" -msgstr "Executer" - -#: ../src/autostart.cpp:129 -msgid "&Add" -msgstr "&Ajouter" - -#: ../src/autostart.cpp:131 -msgid "&Remove" -msgstr "&Supprimer" - -#: ../src/autostart.cpp:133 -msgid "&Properties" -msgstr "&Propiétés" - -#: ../src/autostart.cpp:317 -msgid "This module helps you configure which applications KDE runs When starting up and shutting down." -msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE." - diff --git a/redhat/applications/kde-systemsettings/kde-settings-laptops.directory b/redhat/applications/kde-systemsettings/kde-settings-laptops.directory deleted file mode 100644 index 687a493c4..000000000 --- a/redhat/applications/kde-systemsettings/kde-settings-laptops.directory +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Laptops & Power -Name[br]=Gremm -Name[el]=Ισχύς -Name[it]=Energia -Name[mt]=Elettriku -Name[nl]=Energie -Name[pa]=ਊਰਜਾ(power) -Name[pt_BR]=Energia -Name[ru]=Управление питанием -Name[sv]=Effekt -Icon=energy diff --git a/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch index 4aca15ea1..a9e97af33 100644 --- a/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch +++ b/redhat/applications/kvirc/kvirc-3.5.13-ftbfs.patch @@ -5,7 +5,7 @@ $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\" -kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -+kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio ++kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio -lkdecore -lkdeui kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la bin_PROGRAMS = kvirc diff --git a/redhat/components-3.5.13.txt b/redhat/components-3.5.13.txt index 220a664ee..8e7f45196 100644 --- a/redhat/components-3.5.13.txt +++ b/redhat/components-3.5.13.txt @@ -6,6 +6,8 @@ dependencies/dbus-1-tqt dependencies/libcaldav dependencies/libcarddav dependencies/arts +dependencies/tqca +dependencies/tqca-tls main/kdelibs main/kdebase main/kdebindings @@ -46,6 +48,7 @@ applications/gtk-qt-engine applications/gwenview applications/gwenview-i18n applications/k3b +applications/k3b-i18n applications/k9copy applications/kaffeine applications/kaffeine-mozilla @@ -54,7 +57,6 @@ applications/kbarcode applications/kbfx applications/kbookreader applications/kchmviewer -applications/kcmautostart applications/kcpuload applications/kdbusnotification applications/kde-guidance @@ -115,9 +117,13 @@ applications/tellico applications/wlassistant applications/yakuake extras/akode +extras/icons-crystalsvg-updated +extras/icons-kfaenza +extras/icons-oxygen extras/kasablanca -#extras/kdebluetooth +extras/kcmautostart extras/ksensors extras/style-ia-ora -extras/trinity-desktop extras/theme-baghira +extras/trinity-desktop +extras/twinkle diff --git a/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch b/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch deleted file mode 100644 index 5dd7c5a47..000000000 --- a/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -Nuar tqca-tls.ORI//configure tqca-tls.P//configure ---- tqca-tls.ORI//configure 2012-02-18 11:09:57.695893820 +0100 -+++ tqca-tls.P//configure 2012-02-18 11:28:09.442846406 +0100 -@@ -60,7 +60,7 @@ - if [ "$QC_DEBUG" = "Y" ]; then - echo \$QTDIR not set... trying to find Qt manually - fi -- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do -+ for p in /usr/lib64/tqt /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/lib/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/lib/tqt3 /usr/local/lib64/tqt3 /usr/local/lib/tqt3 /usr/lib64/qt /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/lib/qt /usr/local/share/qt /usr/lib64/qt3 /usr/lib/qt3 /usr/local/lib64/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do - if [ -d "$p/mkspecs" ]; then - QTDIR=$p - break; -@@ -79,15 +79,15 @@ - fi - fi - --if [ ! -x "$QTDIR/bin/qmake" ]; then -+if [ ! -x "$QTDIR/bin/qmake-tqt3" ]; then - if [ "$QC_DEBUG" = "Y" ]; then -- echo Warning: qmake not in \$QTDIR/bin/qmake -+ echo Warning: qmake-tqt3 not in \$QTDIR/bin/qmake-tqt3 - echo trying to find it in \$PATH - fi -- qm=`type -p qmake` -+ qm=`type -p qmake-tqt3` - if [ -x "$qm" ]; then - if [ "$QC_DEBUG" = "Y" ]; then -- echo qmake found in $qm -+ echo qmake-tqt3 found in $qm - fi - else - echo fail -@@ -96,12 +96,12 @@ - echo or I missdetected \$QTDIR=$QTDIR - echo - echo Please set \$QTDIR manually and make sure that -- echo \$QTDIR/bin/qmake exists. -+ echo \$QTDIR/bin/qmake-tqt3 exists. - echo - exit 1; - fi - else -- qm=$QTDIR/bin/qmake -+ qm=$QTDIR/bin/qmake-tqt3 - fi - - gen_files() { -@@ -185,6 +185,8 @@ - - // Make sure tqtinterface can be found - conf->addIncludePath("/usr/include/tqt"); -+ // Make sure tqt3 can be found -+ conf->addIncludePath("/usr/include/tqt3"); - - return true; - } -@@ -507,7 +509,7 @@ - TEMPLATE = app - CONFIG += qt x11 thread console - TARGET = conf --INCLUDEPATH += '/usr/include/tqt' -+INCLUDEPATH += '/usr/include/tqt' '/usr/include/tqt3' - - DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' - DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' -@@ -533,7 +535,7 @@ - ) - - if [ "$?" != "0" ]; then -- rm -rf .qconftemp -+# rm -rf .qconftemp - echo fail - echo - echo "There was an error compiling 'conf'. Be sure you have a proper" diff --git a/redhat/dependencies/tqca/tqca-1.0-fix_tqt3_detection.patch b/redhat/dependencies/tqca/tqca-1.0-fix_tqt3_detection.patch deleted file mode 100644 index 89c044351..000000000 --- a/redhat/dependencies/tqca/tqca-1.0-fix_tqt3_detection.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -Nuar tqca.ORI/configure tqca.P/configure ---- tqca.ORI/configure 2012-04-24 17:24:02.762426535 -0400 -+++ tqca.P/configure 2012-04-24 17:41:57.164913623 -0400 -@@ -8,7 +8,7 @@ - - Main options: - --prefix=[path] Base path for build/install. Default: /usr/local -- --qtdir=[path] Directory where Qt is installed. -+ --qtdir=[path] Directory where [T]Qt is installed. - --help This help text. - - EOT -@@ -37,7 +37,7 @@ - - PREFIX=${PREFIX:-/usr/local} - --echo "Configuring TQt Cryptographic Architecture (QCA) ..." -+echo "Configuring TQt Cryptographic Architecture (TQCA) ..." - - if [ "$QC_DEBUG" = "Y" ]; then - echo -@@ -52,7 +52,7 @@ - if [ "$QC_DEBUG" = "Y" ]; then - echo \$QTDIR not set... trying to find Qt manually - fi -- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do -+ for p in /usr/lib64/tqt /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/lib/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/lib/tqt3 /usr/local/lib64/tqt3 /usr/local/lib/tqt3 /usr/lib64/qt /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/lib/qt /usr/local/share/qt /usr/lib64/qt3 /usr/lib/qt3 /usr/local/lib64/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do - if [ -d "$p/mkspecs" ]; then - QTDIR=$p - break; -@@ -62,7 +62,7 @@ - echo fail - echo - echo Unable to find Qt 'mkspecs'. Please set QTDIR -- echo manually. Perhaps you need to install Qt 3 -+ echo manually. Perhaps you need to install [T]Qt 3 - echo development utilities. You may download them either - echo from the vendor of your operating system or from - echo www.trolltech.com -@@ -71,12 +71,12 @@ - fi - fi - --if [ ! -x "$QTDIR/bin/qmake" ]; then -+if [ ! -x "$QTDIR/bin/qmake-tqt3" ] && [ ! -x "$QTDIR/bin/qmake" ]; then - if [ "$QC_DEBUG" = "Y" ]; then - echo Warning: qmake not in \$QTDIR/bin/qmake - echo trying to find it in \$PATH - fi -- qm=`type -p qmake` -+ qm=`type -p qmake-tqt3 || type -p qmake` - if [ -x "$qm" ]; then - if [ "$QC_DEBUG" = "Y" ]; then - echo qmake found in $qm -@@ -93,7 +93,11 @@ - exit 1; - fi - else -- qm=$QTDIR/bin/qmake -+ if [ -x $QTDIR/bin/qmake-tqt3 ]; then -+ qm=$QTDIR/bin/qmake-tqt3 -+ else -+ qm=$QTDIR/bin/qmake -+ fi - fi - - gen_files() { -@@ -414,6 +418,7 @@ - CONFIG += qt x11 thread console - TARGET = conf - INCLUDEPATH += '/usr/include/tqt' -+INCLUDEPATH += '/usr/include/tqt3' - - DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' - DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' -@@ -438,7 +443,7 @@ - ) - - if [ "$?" != "0" ]; then -- rm -rf .qconftemp -+# rm -rf .qconftemp - echo fail - echo - echo "There was an error compiling 'conf'. Be sure you have a proper" -diff -Nuar tqca.ORI/qca.pro tqca.P/qca.pro ---- tqca.ORI/qca.pro 2012-04-24 17:24:02.760426575 -0400 -+++ tqca.P/qca.pro 2012-04-24 17:39:36.323825994 -0400 -@@ -21,6 +21,7 @@ - QCA_CPP = src - INCLUDEPATH += $$QCA_CPP - INCLUDEPATH += /usr/include/tqt -+INCLUDEPATH += /usr/include/tqt3 - - HEADERS += \ - $$QCA_CPP/qca.h \ diff --git a/redhat/extras/akode/akode-autotools.patch b/redhat/extras/akode/akode-autotools.patch index aa54459ce..d08ac3446 100644 --- a/redhat/extras/akode/akode-autotools.patch +++ b/redhat/extras/akode/akode-autotools.patch @@ -1,14 +1,3 @@ ---- akode-2.0.2/admin/cvs.sh.ORI 2012-01-13 20:29:38.576590872 +0100 -+++ akode-2.0.2/admin/cvs.sh 2012-01-13 20:30:45.972837972 +0100 -@@ -68,7 +68,7 @@ - echo "*** KDE requires automake $required_automake_version" - exit 1 - ;; -- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*) - echo "*** $AUTOMAKE_STRING found." - UNSERMAKE=no - ;; --- akode-2.0.2/akode/lib/Makefile.am.ORI 2012-01-16 19:17:09.849211160 +0100 +++ akode-2.0.2/akode/lib/Makefile.am 2012-01-16 19:17:24.496410002 +0100 @@ -12,6 +12,7 @@ @@ -19,3 +8,65 @@ libakode_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries) libakode_la_LIBADD = $(LIBPTHREAD) $(AKODE_LIBDL) $(LIBSEM) +--- akode-2.0.2/configure.in.in.ORI 2013-05-19 23:25:31.450512262 +0200 ++++ akode-2.0.2/configure.in.in 2013-05-19 23:25:37.156390421 +0200 +@@ -55,7 +55,7 @@ + + dnl without this order in this file, automake will be confused! + dnl +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADER(config.h) + + dnl checks for programs. + dnl first check for c/c++ compilers +--- akode-2.0.2/admin/configure.in.min~ 2013-05-19 23:35:21.532965131 +0200 ++++ akode-2.0.2/admin/configure.in.min 2013-05-19 23:34:19.011289846 +0200 +@@ -41,7 +41,7 @@ + KDE_SET_PREFIX + + dnl generate the config header +-AM_CONFIG_HEADER(config.h) dnl at the distribution this done ++AC_CONFIG_HEADER(config.h) dnl at the distribution this done + + dnl Checks for programs. + AC_CHECK_COMPILERS +--- akode-2.0.2/admin/cvs.sh.autotools 2007-01-15 10:06:45.000000000 +0100 ++++ akode-2.0.2/admin/cvs.sh 2013-05-19 23:37:14.145581582 +0200 +@@ -68,7 +68,7 @@ + echo "*** KDE requires automake $required_automake_version" + exit 1 + ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*) + echo "*** $AUTOMAKE_STRING found." + UNSERMAKE=no + ;; +@@ -128,7 +128,7 @@ + echo "*** Creating configure" + call_and_fix_autoconf + +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in +@@ -184,7 +184,7 @@ + fi + fi + $ACLOCAL $ACLOCALFLAGS +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^AC_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in +--- akode-2.0.2/akode/configure.in.in.ORI 2013-05-19 23:39:02.874283156 +0200 ++++ akode-2.0.2/akode/configure.in.in 2013-05-19 23:39:13.381061201 +0200 +@@ -2,7 +2,7 @@ + dnl AC_OUTPUT(akode/akode-config) + dnl AC_OUTPUT(akode/akode.pc) + +-AM_CONFIG_HEADER(akode/lib/akode_export.h) ++AC_CONFIG_HEADER(akode/lib/akode_export.h) + + AC_DEFUN([AC_CHECK_LIBFLAC], + [ diff --git a/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch index 15e49692c..034caa068 100644 --- a/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch +++ b/redhat/extras/kasablanca/kasablanca-0.4.0.2-fix_autotools_detection.patch @@ -1,5 +1,5 @@ ---- kasablanca-0.4.0.2/admin/cvs.sh.ORI 2011-12-04 15:24:44.405943353 +0100 -+++ kasablanca-0.4.0.2/admin/cvs.sh 2011-12-04 15:33:50.829581434 +0100 +--- kasablanca-0.4.0.2/admin/cvs.sh.autotools 2004-06-11 14:04:39.000000000 +0200 ++++ kasablanca-0.4.0.2/admin/cvs.sh 2013-06-04 21:13:20.169314990 +0200 @@ -30,7 +30,7 @@ required_autoconf_version="2.53 or newer" AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` @@ -23,10 +23,39 @@ exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* ) : ;; -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.1[012]* ) : ;; ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.1[0-9]* ) : ;; "" ) echo "*** AUTOMAKE NOT FOUND!." echo "*** KDE requires automake $required_automake_version" +@@ -122,7 +122,7 @@ + echo "*** Creating configure" + call_and_fix_autoconf + +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + fi +@@ -176,7 +176,7 @@ + fi + fi + $ACLOCAL $ACLOCALFLAGS +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + fi +--- kasablanca-0.4.0.2/admin/configure.in.min.ORI 2013-06-04 21:14:53.495416780 +0200 ++++ kasablanca-0.4.0.2/admin/configure.in.min 2013-06-04 21:15:00.293278499 +0200 +@@ -41,7 +41,7 @@ + KDE_SET_PREFIX + + dnl generate the config header +-AM_CONFIG_HEADER(config.h) dnl at the distribution this done ++AC_CONFIG_HEADER(config.h) dnl at the distribution this done + + dnl Checks for programs. + AC_CHECK_COMPILERS --- kasablanca-0.4.0.2/admin/acinclude.m4.in.ORI 2011-12-04 15:37:05.013464315 +0100 +++ kasablanca-0.4.0.2/admin/acinclude.m4.in 2011-12-04 15:40:40.722904947 +0100 @@ -468,14 +468,14 @@ diff --git a/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch b/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch index 3f8ec4139..36ac3d807 100644 --- a/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch +++ b/redhat/extras/kickoff-i18n/kickoff-i18n-1.0-fix_autotools_detection.patch @@ -1,11 +1,40 @@ ---- kickoff-i18n-1.0/admin/cvs.sh.ORI 2012-08-03 21:16:36.104888893 +0200 -+++ kickoff-i18n-1.0/admin/cvs.sh 2012-08-03 21:16:54.488505909 +0200 +--- kickoff-i18n-1.0/admin/configure.in.min.ORI 2013-06-04 21:34:45.145197643 +0200 ++++ kickoff-i18n-1.0/admin/configure.in.min 2013-06-04 21:34:54.004020422 +0200 +@@ -41,7 +41,7 @@ + KDE_SET_PREFIX + + dnl generate the config header +-AM_CONFIG_HEADER(config.h) dnl at the distribution this done ++AC_CONFIG_HEADER(config.h) dnl at the distribution this done + + dnl Checks for programs. + AC_CHECK_COMPILERS +--- kickoff-i18n-1.0/admin/cvs.sh.automake 2007-01-15 10:06:45.000000000 +0100 ++++ kickoff-i18n-1.0/admin/cvs.sh 2013-06-04 21:34:39.471311140 +0200 @@ -68,7 +68,7 @@ echo "*** KDE requires automake $required_automake_version" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]*) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*) echo "*** $AUTOMAKE_STRING found." UNSERMAKE=no ;; +@@ -128,7 +128,7 @@ + echo "*** Creating configure" + call_and_fix_autoconf + +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in +@@ -184,7 +184,7 @@ + fi + fi + $ACLOCAL $ACLOCALFLAGS +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in diff --git a/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch b/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch index 6cb76f8a3..04b393095 100644 --- a/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch +++ b/redhat/extras/ksensors/ksensors-0.7.3-fix_autotools_detection.patch @@ -1,11 +1,31 @@ ---- ksensors-0.7.3/admin/cvs.sh.ORI 2012-10-07 11:06:41.616636004 +0200 -+++ ksensors-0.7.3/admin/cvs.sh 2012-10-07 11:07:55.975129334 +0200 +--- ksensors-0.7.3/admin/cvs.sh.autotools 2013-06-04 21:59:18.325691011 +0200 ++++ ksensors-0.7.3/admin/cvs.sh 2013-06-04 21:58:49.715264098 +0200 @@ -64,7 +64,7 @@ echo "*** KDE requires automake 1.6.1 or newer" exit 1 ;; - automake*1.6.* | automake*1.7* ) : ;; -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* ) : ;; ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* ) : ;; "" ) echo "*** AUTOMAKE NOT FOUND!." echo "*** KDE requires automake 1.6.1 or newer" +@@ -123,7 +123,7 @@ + echo "*** Creating configure" + call_and_fix_autoconf + +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + fi +--- ksensors-0.7.3/admin/configure.in.min.ORI 2013-06-04 21:59:24.783561656 +0200 ++++ ksensors-0.7.3/admin/configure.in.min 2013-06-04 21:59:33.526386508 +0200 +@@ -41,7 +41,7 @@ + KDE_SET_PREFIX + + dnl generate the config header +-AM_CONFIG_HEADER(config.h) dnl at the distribution this done ++AC_CONFIG_HEADER(config.h) dnl at the distribution this done + + dnl Checks for programs. + AC_CHECK_COMPILERS diff --git a/redhat/extras/libkarma/karma-sharp.dll.config b/redhat/extras/libkarma/karma-sharp.dll.config deleted file mode 100644 index 180d8b4fb..000000000 --- a/redhat/extras/libkarma/karma-sharp.dll.config +++ /dev/null @@ -1,3 +0,0 @@ -<configuration> - <dllmap dll="karma" target="libkarma.so.0" /> -</configuration>
\ No newline at end of file diff --git a/redhat/extras/libkarma/libkarma-0.1.2-fix_installation.patch b/redhat/extras/libkarma/libkarma-0.1.2-fix_installation.patch deleted file mode 100644 index ef8b61fa1..000000000 --- a/redhat/extras/libkarma/libkarma-0.1.2-fix_installation.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- libkarma-0.1.2/karma-sharp/karma-sharp.pc.in.ORI 2012-08-03 13:00:49.786984296 +0200 -+++ libkarma-0.1.2/karma-sharp/karma-sharp.pc.in 2012-08-03 13:02:39.714283226 +0200 -@@ -1,8 +1,8 @@ - prefix=@prefix@ --exec_prefix=${prefix} --libdir=${prefix}/lib --includedir=${prefix}/include --Libraries=${prefix}/lib/karma-sharp/karma-sharp.dll -+exec_prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+Libraries=${libdir}/karma-sharp/karma-sharp.dll - - Name: karma-sharp - Description: karma-sharp - Library for interfacing with Rio Karma devices ---- libkarma-0.1.2/src/Makefile.ORI 2012-08-03 13:14:57.231632405 +0200 -+++ libkarma-0.1.2/src/Makefile 2012-08-03 13:16:05.653554314 +0200 -@@ -7,6 +7,7 @@ - INST_HEADERS=lkarma.h utf8.h - - LIBDIR=../lib -+LIB=lib - - CC?=gcc - AR?=ar -@@ -37,19 +38,19 @@ - default: all - - install: shared-lib-stamp static-lib-stamp -- ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/lib -+ ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/$(LIB) - ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include - ../install-sh -m 0755 -d $(DESTDIR)$(PREFIX)/include/libkarma -- ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(TARGET).a -- ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/lib/ $(LIBDIR)/$(OUT_VERSION) -- $(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR) -- $(RM) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE) -- $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_MAJOR) -- $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/lib/$(OUT_BASE) -+ ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/$(LIB)/ $(LIBDIR)/$(TARGET).a -+ ../install-sh -m 0755 -t $(DESTDIR)$(PREFIX)/$(LIB)/ $(LIBDIR)/$(OUT_VERSION) -+ $(RM) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_MAJOR) -+ $(RM) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_BASE) -+ $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_MAJOR) -+ $(LN_S) $(OUT_VERSION) $(DESTDIR)$(PREFIX)/$(LIB)/$(OUT_BASE) - ../install-sh -m 0644 -t $(DESTDIR)$(PREFIX)/include/libkarma/ $(INST_HEADERS) - - uninstall: -- $(RM) $(PREFIX)/lib/$(TARGET).a $(PREFIX)/lib/$(OUT_MAJOR) $(PREFIX)/lib/$(OUT_BASE) $(PREFIX)/lib/$(OUT_VERSION) -+ $(RM) $(PREFIX)/$(LIB)/$(TARGET).a $(PREFIX)/$(LIB)/$(OUT_MAJOR) $(PREFIX)/$(LIB)/$(OUT_BASE) $(PREFIX)/$(LIB)/$(OUT_VERSION) - $(RM) -r $(PREFIX)/include/libkarma - - OBJS = $(SRCS:.c=.o) ---- libkarma-0.1.2/karma-sharp/Makefile.ORI 2012-08-03 13:21:02.657679440 +0200 -+++ libkarma-0.1.2/karma-sharp/Makefile 2012-08-03 13:21:07.144597685 +0200 -@@ -22,22 +22,23 @@ - - karma-sharp.pc: FORCE - sed -e 's,@prefix@,$(PREFIX),g; s,@VERSION@,$(VERSION),g' \ -+ -e 's,@libdir@,$(PREFIX)/$(LIB),g; s,@includedir@,$(PREFIX)/include,g;' \ - karma-sharp.pc.in > karma-sharp.pc - - ifdef HAS_MONO - install: $(ASSEMBLY) karma-sharp.pc $(ASSEMBLY).config -- ../install-sh -d $(DESTDIR)$(PREFIX)/lib/karma-sharp -- ../install-sh -d $(DESTDIR)$(PREFIX)/lib/pkgconfig -- ../install-sh -t $(DESTDIR)$(PREFIX)/lib/karma-sharp $(ASSEMBLY) $(ASSEMBLY).config -- ../install-sh -t $(DESTDIR)$(PREFIX)/lib/pkgconfig -m 0644 karma-sharp.pc -+ ../install-sh -d $(DESTDIR)$(PREFIX)/$(LIB)/karma-sharp -+ ../install-sh -d $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig -+ ../install-sh -t $(DESTDIR)$(PREFIX)/$(LIB)/karma-sharp $(ASSEMBLY) $(ASSEMBLY).config -+ ../install-sh -t $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig -m 0644 karma-sharp.pc - else - install: - - endif - - uninstall: FORCE -- $(RM) -r $(PREFIX)/lib/karma-sharp -- $(RM) $(PREFIX)/lib/pkgconfig/karma-sharp.pc -+ $(RM) -r $(PREFIX)/$(LIB)/karma-sharp -+ $(RM) $(PREFIX)/$(LIB)/pkgconfig/karma-sharp.pc - - $(ASSEMBLY): $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES) - $(MCS) $(MCS_FLAGS) -unsafe -target:library -out:$@ $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES:%=-resource:%) -r:Mono.Posix diff --git a/redhat/extras/libkarma/libkarma-0.1.2.tar.gz b/redhat/extras/libkarma/libkarma-0.1.2.tar.gz Binary files differdeleted file mode 100644 index 3060acf72..000000000 --- a/redhat/extras/libkarma/libkarma-0.1.2.tar.gz +++ /dev/null diff --git a/redhat/extras/libkarma/multimedia-player-rio-karma.png b/redhat/extras/libkarma/multimedia-player-rio-karma.png Binary files differdeleted file mode 100644 index 79cc980ad..000000000 --- a/redhat/extras/libkarma/multimedia-player-rio-karma.png +++ /dev/null diff --git a/redhat/extras/libkarma/preferences.fdi b/redhat/extras/libkarma/preferences.fdi deleted file mode 100644 index 7e1021711..000000000 --- a/redhat/extras/libkarma/preferences.fdi +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> - -<deviceinfo version="0.2"> - <device> - <match key="info.udi" string="/org/freedesktop/Hal/devices/storage_serial_Rio_Rio_Karma_0000000000000000"> - <merge key="storage.policy.should_mount" type="bool">true</merge> - <merge key="storage.policy.is_removable" type="bool">true</merge> - <merge key="storage.policy.default.mount_root" type="string">/media</merge> - </match> -</device> - -<device> - <match key="info.udi" string="/org/freedesktop/Hal/devices/volume_part2_size_19919976960"> - <merge key="volume.policy.desired_mount_point" type="string">karma</merge> - <merge key="volume.policy.mount_filesystem" type="string">omfs</merge> - </match> -</device> -</deviceinfo> - diff --git a/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch index 0d3190cef..0523b9e9d 100644 --- a/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch +++ b/redhat/extras/style-ia-ora/ia_ora-1.08-fix_automake_detection.patch @@ -1,11 +1,40 @@ ---- ia_ora-kde-1.0.8/admin/cvs.sh.ORI 2012-08-03 22:52:42.259238606 +0200 -+++ ia_ora-kde-1.0.8/admin/cvs.sh 2012-08-03 22:52:49.735803751 +0200 +--- ia_ora-kde-1.0.8/admin/configure.in.min.ORI 2013-06-04 22:06:43.320769735 +0200 ++++ ia_ora-kde-1.0.8/admin/configure.in.min 2013-06-04 22:06:49.748640759 +0200 +@@ -41,7 +41,7 @@ + KDE_SET_PREFIX + + dnl generate the config header +-AM_CONFIG_HEADER(config.h) dnl at the distribution this done ++AC_CONFIG_HEADER(config.h) dnl at the distribution this done + + dnl Checks for programs. + AC_CHECK_COMPILERS +--- ia_ora-kde-1.0.8/admin/cvs.sh.automake11 2007-08-23 21:48:58.000000000 +0200 ++++ ia_ora-kde-1.0.8/admin/cvs.sh 2013-06-04 22:06:38.413868181 +0200 @@ -68,7 +68,7 @@ echo "*** KDE requires automake $required_automake_version" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* ) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[012]* ) ++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* ) echo "*** $AUTOMAKE_STRING found." UNSERMAKE=no ;; +@@ -128,7 +128,7 @@ + echo "*** Creating configure" + call_and_fix_autoconf + +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in +@@ -184,7 +184,7 @@ + fi + fi + $ACLOCAL $ACLOCALFLAGS +-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then ++if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then + echo "*** Creating config.h template" + $AUTOHEADER || exit 1 + touch config.h.in diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo index bf099f4a2..f3cb8e34f 100644 --- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo @@ -3,18 +3,21 @@ name=trinity-3.5.13 #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list enabled=1 -gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-noarch] name=trinity-3.5.13-noarch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list enabled=1 -gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-source] name=trinity-3.5.13-source #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list enabled=0 -gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo index 6f8312cdd..c3450eaed 100644 --- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo +++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo @@ -3,18 +3,21 @@ name=trinity-3.5.13 #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list enabled=1 -gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-noarch] name=trinity-3.5.13-noarch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list enabled=1 -gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity [trinity-3.5.13-source] name=trinity-3.5.13-noarch #baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list enabled=0 -gpgcheck=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index df6362bc3..6dfe7d68c 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -3,10 +3,11 @@ cd "$( dirname "$0" )" ARGS="" -eval TARBALLS_DIR=~/tde/3.5.13.1 +eval TARBALLS_DIR=~/tde/tde-tarballs/3.5.13.2 +DIST="$(rpmdist.sh --dist)" +# CCACHE related stuff if [ ! -d /var/cache/ccache ]; then - DIST="$(rpmdist.sh --dist)" [ -z "${DIST}" ] && DIST="$(rpm -E "%{dist}")" if [ -n "${DIST}" ]; then export CCACHE_DIR=~/.ccache${DIST}.$(uname -m) @@ -14,20 +15,19 @@ if [ ! -d /var/cache/ccache ]; then fi while [ $# -gt 0 ]; do - case "$1" in - "--auto"|"-a") AUTO=1;; - "--version"|"-v") REQVERSION="$2"; shift;; - "--"*) ARGS="${ARGS} $1";; - *) COMP="${1%%/}";; - esac - shift + case "$1" in + "--auto"|"-a") AUTO=1;; + "--version"|"-v") REQVERSION="$2"; shift;; + "--"*) ARGS="${ARGS} $1";; + *) COMP="${1%%/}";; + esac + shift done clear cat <<EOF $(< /etc/redhat-release) [$(uname -m)] This script generates RPM of TDE from source tarball. -Please choose a TDE component to build. EOF @@ -38,14 +38,14 @@ SUSE="$( rpm -E "%{suse_version}" )" PCLINUXOS="$( rpm -E "%{pclinuxos}" )" MGAVERSION="$( rpm -E "%{mgaversion}" )" if [ "${RHEL}" = "%{rhel}" ] && [ "${FEDORA}" = "%{fedora}" ] && [ "${SUSE}" = "%{suse_version}" ] && [ "${PCLINUXOS}" = "%{pclinuxos}" ] && [ "${MGAVERSION}" = "%{mgaversion}" ] ; then - cat <<EOF + cat <<EOF Error: RPM macro %rhel or %fedora must be set to the distribution version to build ! E.g: %rhel 6 or: %fedora 15 EOF - exit 1 + exit 1 fi # Checks TDE version to use @@ -54,39 +54,46 @@ fi #fi if [ -z "${COMP}" ]; then - select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do break; done + select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do break; done fi # Gets package version from 'components.txt' file VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt ) # If no version is set in text file, get version number from source tarball name +COMPNAME="${COMP##*/}" if [ -z "${VERSION}" ]; then - if [ -n "${REQVERSION}" ]; then - set $( cd "${TARBALLS_DIR}"; echo ${COMP##*/}*-${REQVERSION%-sru}*.tar.gz) - else - set $( cd "${TARBALLS_DIR}"; echo ${COMP##*/}*.tar.* ) - fi - if [ $# -gt 1 ]; then - select VERSION in $*; do break; done - elif [ -r "${TARBALLS_DIR}/$1" ]; then - VERSION="$1" - elif [ "${COMP}" = "trinity-live" ]; then - VERSION="3.5.13" - else - echo "No source tarball found for '${COMP}' !" - exit 0 - fi - VERSION="${VERSION##${COMP##*/}-}" - VERSION="${VERSION%%.tar.gz}" - VERSION="${VERSION%%.tar.bz2}" -# If version is defined in spec file: appends the date -else - VERSION="${VERSION}.$(date +%Y%m%d)" + for d in "${TARBALLS_DIR}/main/${COMP%/*}" "${TARBALLS_DIR}/main/" "${PWD}/main/${COMP}/"; do + for n in "trinity-${COMPNAME}-${REQVERSION:-*}.tar.gz" "trinity-${COMPNAME}?-${REQVERSION:-*}.tar.gz" "trinity-${COMPNAME/kde/tde}-${REQVERSION:-*}.tar.gz" "trinity-${COMPNAME/kde/tde}-${REQVERSION:-*}*.tar.gz"; do +# echo $d/$n + set $d/$n + if [ $# -eq 0 ]; then + echo "No tarball found !" + exit 1 + elif [ $# -eq 1 ] && [ -r "$1" ]; then + TARBALL=$1 + elif [ $# -gt 1 ]; then + select TARBALL in $*; do break; done + fi + done + done + + echo "TARBALL is ${TARBALL##*/}" +fi + +# Checks for version +if [ -z "${VERSION}" ] && [ -n "${REQVERSION}" ]; then + VERSION="${REQVERSION}" +fi + +# Checks for preversion (non-final) +if [ "${TARBALL}" != "${TARBALL%%~pre*}" ]; then + PREVERSION="${TARBALL##*~}" + PREVERSION="${PREVERSION%.tar*}" fi # Chooses a spec file (if many) -set $( cd "${COMP}"; echo *.spec ) +set $( cd "${COMP}"; echo *${COMP##*/}*.spec ) if [ $# -gt 1 ]; then if [ -n "${REQVERSION}" ]; then set $( cd "${COMP}"; echo *-${REQVERSION}.spec ) @@ -98,6 +105,7 @@ elif [ -r "${COMP}/$1" ]; then SPEC="$1" else echo "Fatal: no spec file found !" + echo $1 exit 2 fi @@ -105,7 +113,9 @@ cat <<EOF About to build '${COMP}': Version: '${VERSION}' + Preversion: '${PREVERSION}' Spec file: '${SPEC}' + Tarball: '${TARBALL}' CCACHE_DIR='${CCACHE_DIR}' @@ -127,28 +137,62 @@ LOGFILE=/tmp/log.${COMP##*/} SOURCEDIR="$(mktemp -d)" # Puts the GIT files in SOURCEDIR -cp -rf "${PWD}/${COMP}/"* "${SOURCEDIR}" +#rsync -rLv "${PWD}/${COMP}/" "${SOURCEDIR}/" +while read a b; do + case "${a}" in + "Source"*|"Patch"*) + b=$(rpm -E "${b##*/}") + [ -r "${COMP}/${b}" ] && cp -fv "${COMP}/${b}" "${SOURCEDIR}" + ;; + esac +done < "${COMP}/${SPEC}" + +# Copies the SPEC file +cp -f "${COMP}/${SPEC}" "${SOURCEDIR}" + # Puts the TARBALL in SOURCEDIR -cp -f "${TARBALLS_DIR}/${COMP}-"*.tar* "${SOURCEDIR}" +#cp -f "${TARBALLS_DIR}/${COMP}-"*.tar* "${SOURCEDIR}" +echo "Copying TARBALL ..." +cp -fv "${TARBALL}" "${SOURCEDIR}" + +if [ $(hostname) = "aria.vtf" ]; then + BUILDDIR="$HOME/rpmbuild/BUILD/BUILD${DIST}.$(uname -i)" + BUILDROOTDIR="$HOME/rpmbuild/BUILDROOT/BUILDROOT${DIST}.$(uname -i)" +else + BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" + BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" +fi + +TOPSRCRPMDIR="$(rpm -E %_srcrpmdir)" +TOPRPMDIR="$(rpm -E %_rpmdir)" +SUBDIR="${COMP%/*}" +if [ "${SUBDIR}" = "${COMP}" ]; then + SUBDIR="main" +fi +RPMDIR="${TOPRPMDIR}/${SUBDIR}" +SRCRPMDIR="${TOPSRCRPMDIR}/${SUBDIR}" -BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" -BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" +[ -d "${BUILDDIR}" ] || mkdir "${BUILDDIR}" +[ -d "${BUILDROOTDIR}" ] || mkdir "${BUILDROOTDIR}" set -x ( rpmbuild -ba \ ${ARGS} \ + --define "_specdir ${SOURCEDIR}" \ --define "_sourcedir ${SOURCEDIR}" \ - --define "_builddir ${BUILDDIR}" \ - --define "_buildrootdir ${BUILDROOTDIR}" \ + --define "_builddir ${BUILDDIR}" \ + --define "_buildrootdir ${BUILDROOTDIR}" \ --define "tde_prefix ${PREFIX:-/opt/trinity}" \ - --define "version ${VERSION:-3.5.13}" \ - ${COMP}/${SPEC} || exit 1 + --define "version ${VERSION:-3.5.13.2}" \ + --define "preversion ${PREVERSION}" \ + ${SOURCEDIR}/${SPEC} + echo "RET=$?" ) 2>&1 | tee ${LOGFILE} -RET=$? +eval "$(grep ^RET= ${LOGFILE})" set +x -if [ ${RET} -gt 0 ]; then +if [ "${RET}" -gt 0 ]; then exit ${RET} fi @@ -158,4 +202,6 @@ if grep -q "error: Failed build dependencies:" ${LOGFILE}; then exit 2 fi +set -x rm -rf "${SOURCEDIR}" +#rm -rf "${BUILDDIR}/"*${COMP}-${VERSION}* |
