diff options
| -rwxr-xr-x | redhat/buildall-r14.sh | 1 | ||||
| -rwxr-xr-x | redhat/buildall-sru.sh | 55 | ||||
| -rw-r--r-- | redhat/buildenv.sh | 8 | ||||
| -rw-r--r-- | redhat/packages.fedora | 10 |
4 files changed, 64 insertions, 10 deletions
diff --git a/redhat/buildall-r14.sh b/redhat/buildall-r14.sh index 8e77efba1..86cb48784 100755 --- a/redhat/buildall-r14.sh +++ b/redhat/buildall-r14.sh @@ -295,6 +295,7 @@ fi grpiui applications/krecipes grpiui applications/krename grpiui applications/krusader +grpiui applications/kscope grpiui applications/ksensors grpiui applications/kshowmail grpiui applications/kshutdown diff --git a/redhat/buildall-sru.sh b/redhat/buildall-sru.sh index ce114202b..88cd4a13d 100755 --- a/redhat/buildall-sru.sh +++ b/redhat/buildall-sru.sh @@ -106,7 +106,13 @@ fi # Extra dependencies grpiud extras/akode -if [ "${DIST:0:6}" = ".oss12" ] || [ "${DIST:0:4}" = ".mga" ] || [ "${DIST:0:3}" = ".fc" ]; then +# HAL already exists in: +# Mageia <= 2 +# RHEL <= 6 +# openSUSE <= 11.4 +# Fedora <= 15 +if [ "${DIST:0:6}" = ".oss12" ] || [ "${DIST}" = ".mga3" ] \ +|| [ "${DIST}" = ".fc16" ]|| [ "${DIST}" = ".fc17" ] || [ "${DIST}" = ".fc18" ] || [ "${DIST}" = ".fc19" ]; then if ! is_installed trinity-hal-devel; then grpiu 3rdparty/hal grpiu 3rdparty/hal-info @@ -123,18 +129,28 @@ if [ "${DIST:0:4}" = ".mga" ]; then eval ${PKGINST} htdig || exit 1 fi fi +if [ "${DIST}" = ".el4" ] || [ "${DIST}" = ".el5" ]; then + grpiud 3rdparty/poppler +fi +if [ "${DIST}" = ".el4" ] || [ "${DIST}" = ".el5" ]; then + grpiud 3rdparty/sip +fi # TDE dependencies grpiud dependencies/tqtinterface grpiud dependencies/arts -grpiud dependencies/avahi-tqt -grpiud dependencies/dbus-1-tqt -grpiud dependencies/dbus-tqt grpiud dependencies/libcaldav grpiud dependencies/libcarddav grpiud dependencies/tqca -grpiui dependencies/tqca-tls +if [ "${DIST}" != ".el4" ]; then + grpiud dependencies/avahi-tqt + grpiud dependencies/dbus-1-tqt + grpiud dependencies/dbus-tqt + grpiui dependencies/tqca-tls +fi +# Extra dependencies +grpiud extras/akode # TDE main # basic packages @@ -192,6 +208,15 @@ if [ "${DIST:0:4}" != ".mga" ]; then fi fi +## LIBOTR3: required for kopete-otr +if [ "${DIST:0:5}" = ".mga3" ]; then + if ! is_installed libotr3; then + grpiu 3rdparty/libotr3 + eval ${PKGINST} libotr3 || exit 1 + eval ${PKGINST} libotr3-devel || exit 1 + fi +fi + ## PYTHON-QT3: for Python-stuff if ! is_installed python-qt3; then if [ "${DIST:0:3}" = ".el" ] || [ "${DIST:0:3}" = ".fc" ]; then @@ -255,15 +280,21 @@ grpiui applications/kbookreader grpiui applications/kchmviewer grpiui applications/kcmautostart grpiui applications/kcpuload -grpiui applications/kdbusnotification +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kdbusnotification +fi grpiui applications/kdiff3 grpiui applications/kdirstat grpiui applications/keep #grpiui applications/kerry grpiui applications/kile -grpiui applications/kima +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kima +fi grpiui applications/kiosktool -grpiui applications/kmplayer +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kmplayer +fi grpiui applications/kmyfirewall grpiui applications/kmymoney grpiui applications/knemo @@ -282,7 +313,9 @@ fi grpiui applications/konversation grpiui applications/kopete-otr grpiui applications/kpicosim -grpiui applications/kpilot +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kpilot +fi if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then grpiui applications/kpowersave fi @@ -313,7 +346,9 @@ grpiui applications/tderadio grpiui applications/tde-style-lipstik grpiui applications/tde-style-qtcurve grpiui applications/tdesudo -grpiui applications/tdesvn +if [ "${DIST}" != ".el4" ]; then + grpiui applications/tdesvn +fi grpiui applications/tde-systemsettings grpiui applications/tdmtheme grpiui applications/tellico diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index a1a03f8c0..f7aef2a08 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -74,3 +74,11 @@ alias crz='(cdrpm; createrepo $(uname -i); createrepo noarch; sudo zypper refres # Build local repository (PCLOS) alias cra='(cdrpm; genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)' alias crac='(cdrpm; for i in i586 noarch x86_64; do cd $i; tdesortrpm.sh; cd -; done; rpmsign --addsign */RPMS.*/*.rpm; for i in i586 noarch x86_64; do for j in 3rdparty applications dependencies extras libraries main; do genpkglist $PWD/$i $j; done; done; for i in i586 noarch x86_64; do genbasedir $PWD/$i 3rdparty applications dependencies extras libraries main; done; sudo apt-get update)' + +# Reinstall packages (Mageia) +getrpmfromsrpm() { + rpm -qa --qf "%{name} %{sourcerpm}\n"|grep "$1"|awk '{print $1}' +} +reinst() { + sudo urpmi --replacepkgs --allow-force $(getrpmfromsrpm $1) +} diff --git a/redhat/packages.fedora b/redhat/packages.fedora index 4b26cb60d..93f9bad28 100644 --- a/redhat/packages.fedora +++ b/redhat/packages.fedora @@ -184,3 +184,13 @@ librsvg2-tools libXv-devel net-tools libcap-devel +libmng-devel +libXcomposite-devel +libXdamage-devel +libXxf86vm-devel +java-1.4.2-gcj-compat-devel +libgcj-devel +gcc-java + +ocaml +pcsc-lite-devel |