diff --git a/redhat/components.txt b/redhat/components.txt index f8b06c9aa..c7b7a1b39 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -4,7 +4,8 @@ libraries/libkipi libraries/libksquirrel libraries/python-trinity libraries/pykdeextensions -qt3 +dependencies/qt3 +dependencies/tqt3 dependencies/libcaldav dependencies/libcarddav dependencies/tqtinterface @@ -119,3 +120,4 @@ applications/kmplayer applications/kvkbd applications/potracegui applications/soundkonverter + diff --git a/redhat/qt3/0084-compositing-properties.patch b/redhat/dependencies/qt3/0084-compositing-properties.patch similarity index 100% rename from redhat/qt3/0084-compositing-properties.patch rename to redhat/dependencies/qt3/0084-compositing-properties.patch diff --git a/redhat/qt3/assistant3.desktop b/redhat/dependencies/qt3/assistant3.desktop similarity index 100% rename from redhat/qt3/assistant3.desktop rename to redhat/dependencies/qt3/assistant3.desktop diff --git a/redhat/qt3/designer3.desktop b/redhat/dependencies/qt3/designer3.desktop similarity index 100% rename from redhat/qt3/designer3.desktop rename to redhat/dependencies/qt3/designer3.desktop diff --git a/redhat/qt3/linguist3.desktop b/redhat/dependencies/qt3/linguist3.desktop similarity index 100% rename from redhat/qt3/linguist3.desktop rename to redhat/dependencies/qt3/linguist3.desktop diff --git a/redhat/qt3/qt-3.0.5-nodebug.patch b/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch similarity index 100% rename from redhat/qt3/qt-3.0.5-nodebug.patch rename to redhat/dependencies/qt3/qt-3.0.5-nodebug.patch diff --git a/redhat/qt3/qt-3.1.0-makefile.patch b/redhat/dependencies/qt3/qt-3.1.0-makefile.patch similarity index 100% rename from redhat/qt3/qt-3.1.0-makefile.patch rename to redhat/dependencies/qt3/qt-3.1.0-makefile.patch diff --git a/redhat/qt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch similarity index 100% rename from redhat/qt3/qt-3.3.4-print-CJK.patch rename to redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch diff --git a/redhat/qt3/qt-3.3.6-fontrendering-214371.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch similarity index 100% rename from redhat/qt3/qt-3.3.6-fontrendering-214371.patch rename to redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch diff --git a/redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch similarity index 100% rename from redhat/qt3/qt-3.3.6-fontrendering-gu-228452.patch rename to redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch similarity index 100% rename from redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch rename to redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch similarity index 100% rename from redhat/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch rename to redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch diff --git a/redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch similarity index 100% rename from redhat/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch rename to redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch diff --git a/redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch similarity index 100% rename from redhat/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch rename to redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch diff --git a/redhat/qt3/qt-3.3.8-fontrendering-#214570.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch similarity index 100% rename from redhat/qt3/qt-3.3.8-fontrendering-#214570.patch rename to redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch diff --git a/redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch similarity index 100% rename from redhat/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch rename to redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch diff --git a/redhat/qt3/qt-uic-nostdlib.patch b/redhat/dependencies/qt3/qt-uic-nostdlib.patch similarity index 100% rename from redhat/qt3/qt-uic-nostdlib.patch rename to redhat/dependencies/qt3/qt-uic-nostdlib.patch diff --git a/redhat/qt3/qt-x11-free-3.3.2-quiet.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.2-quiet.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch diff --git a/redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.4-fullscreen.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch diff --git a/redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch diff --git a/redhat/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch diff --git a/redhat/qt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.6-strip.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch diff --git a/redhat/qt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.7-arm.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch diff --git a/redhat/qt3/qt-x11-free-3.3.7-umask.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.7-umask.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch diff --git a/redhat/qt3/qt-x11-free-3.3.8-odbc.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.8-odbc.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch diff --git a/redhat/qt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.8b-typo.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch diff --git a/redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch similarity index 100% rename from redhat/qt3/qt-x11-free-3.3.8b-uic-multilib.patch rename to redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch diff --git a/redhat/qt3/qt.csh b/redhat/dependencies/qt3/qt.csh similarity index 100% rename from redhat/qt3/qt.csh rename to redhat/dependencies/qt3/qt.csh diff --git a/redhat/qt3/qt.sh b/redhat/dependencies/qt3/qt.sh similarity index 100% rename from redhat/qt3/qt.sh rename to redhat/dependencies/qt3/qt.sh diff --git a/redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch similarity index 100% rename from redhat/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch rename to redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch diff --git a/redhat/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec similarity index 100% rename from redhat/qt3/qt3.spec rename to redhat/dependencies/qt3/qt3.spec diff --git a/redhat/qt3/qtconfig3.desktop b/redhat/dependencies/qt3/qtconfig3.desktop similarity index 100% rename from redhat/qt3/qtconfig3.desktop rename to redhat/dependencies/qt3/qtconfig3.desktop diff --git a/redhat/tqt3/0084-compositing-properties.patch b/redhat/dependencies/tqt3/0084-compositing-properties.patch similarity index 100% rename from redhat/tqt3/0084-compositing-properties.patch rename to redhat/dependencies/tqt3/0084-compositing-properties.patch diff --git a/redhat/tqt3/assistant3.desktop b/redhat/dependencies/tqt3/assistant3.desktop similarity index 100% rename from redhat/tqt3/assistant3.desktop rename to redhat/dependencies/tqt3/assistant3.desktop diff --git a/redhat/tqt3/designer3.desktop b/redhat/dependencies/tqt3/designer3.desktop similarity index 100% rename from redhat/tqt3/designer3.desktop rename to redhat/dependencies/tqt3/designer3.desktop diff --git a/redhat/tqt3/linguist3.desktop b/redhat/dependencies/tqt3/linguist3.desktop similarity index 100% rename from redhat/tqt3/linguist3.desktop rename to redhat/dependencies/tqt3/linguist3.desktop diff --git a/redhat/tqt3/qt-3.1.0-makefile.patch b/redhat/dependencies/tqt3/qt-3.1.0-makefile.patch similarity index 100% rename from redhat/tqt3/qt-3.1.0-makefile.patch rename to redhat/dependencies/tqt3/qt-3.1.0-makefile.patch diff --git a/redhat/tqt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch similarity index 100% rename from redhat/tqt3/qt-3.3.4-print-CJK.patch rename to redhat/dependencies/tqt3/qt-3.3.4-print-CJK.patch diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch similarity index 100% rename from redhat/tqt3/qt-3.3.6-fontrendering-gu-228452.patch rename to redhat/dependencies/tqt3/qt-3.3.6-fontrendering-gu-228452.patch diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch similarity index 100% rename from redhat/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch rename to redhat/dependencies/tqt3/qt-3.3.6-fontrendering-ml_IN-209974.patch diff --git a/redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch similarity index 100% rename from redhat/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch rename to redhat/dependencies/tqt3/qt-3.3.6-fontrendering-te_IN-211259.patch diff --git a/redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch similarity index 100% rename from redhat/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch rename to redhat/dependencies/tqt3/qt-3.3.8-fontrendering-as_IN-209972.patch diff --git a/redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch similarity index 100% rename from redhat/tqt3/qt-x11-free-3.3.4-fullscreen.patch rename to redhat/dependencies/tqt3/qt-x11-free-3.3.4-fullscreen.patch diff --git a/redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch similarity index 100% rename from redhat/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch rename to redhat/dependencies/tqt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch diff --git a/redhat/tqt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch similarity index 100% rename from redhat/tqt3/qt-x11-free-3.3.6-strip.patch rename to redhat/dependencies/tqt3/qt-x11-free-3.3.6-strip.patch diff --git a/redhat/tqt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch similarity index 100% rename from redhat/tqt3/qt-x11-free-3.3.7-arm.patch rename to redhat/dependencies/tqt3/qt-x11-free-3.3.7-arm.patch diff --git a/redhat/tqt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch similarity index 100% rename from redhat/tqt3/qt-x11-free-3.3.8b-typo.patch rename to redhat/dependencies/tqt3/qt-x11-free-3.3.8b-typo.patch diff --git a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch similarity index 100% rename from redhat/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch rename to redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch diff --git a/redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 b/redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 similarity index 100% rename from redhat/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 rename to redhat/dependencies/tqt3/qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 diff --git a/redhat/tqt3/qt.csh b/redhat/dependencies/tqt3/qt.csh similarity index 100% rename from redhat/tqt3/qt.csh rename to redhat/dependencies/tqt3/qt.csh diff --git a/redhat/tqt3/qt.sh b/redhat/dependencies/tqt3/qt.sh similarity index 100% rename from redhat/tqt3/qt.sh rename to redhat/dependencies/tqt3/qt.sh diff --git a/redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch b/redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch similarity index 100% rename from redhat/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch rename to redhat/dependencies/tqt3/qt3-3.3.8.d-updates_zh-tw_translations.patch diff --git a/redhat/tqt3/qtconfig3.desktop b/redhat/dependencies/tqt3/qtconfig3.desktop similarity index 100% rename from redhat/tqt3/qtconfig3.desktop rename to redhat/dependencies/tqt3/qtconfig3.desktop diff --git a/redhat/tqt3/tqt3-3.4.0-embed.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-embed.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-embed.patch diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-fontrendering-#214570.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-#214570.patch diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-fontrendering-214371.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-214371.patch diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-209097.patch diff --git a/redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-fontrendering-ml_IN-217657.patch diff --git a/redhat/tqt3/tqt3-3.4.0-nodebug.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-nodebug.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-nodebug.patch diff --git a/redhat/tqt3/tqt3-3.4.0-odbc.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-odbc.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-odbc.patch diff --git a/redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch diff --git a/redhat/tqt3/tqt3-3.4.0-quiet.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-quiet.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-quiet.patch diff --git a/redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-uic-nostdlib.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-uic-nostdlib.patch diff --git a/redhat/tqt3/tqt3-3.4.0-umask.patch b/redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch similarity index 100% rename from redhat/tqt3/tqt3-3.4.0-umask.patch rename to redhat/dependencies/tqt3/tqt3-3.4.0-umask.patch diff --git a/redhat/tqt3/tqt3-3.4.0.spec b/redhat/dependencies/tqt3/tqt3-3.4.0.spec similarity index 100% rename from redhat/tqt3/tqt3-3.4.0.spec rename to redhat/dependencies/tqt3/tqt3-3.4.0.spec diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index 68a82b470..20f8d45ce 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -121,5 +121,3 @@ if grep -q "error: Failed build dependencies:" ${LOGFILE}; then set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 ) exit 2 fi - -