69bf3617 | 2016-11-07 14:02:37 | François Andriot |
RPM packaging: fix tde-style-ia-ora provides |
||
M redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec |
||
diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec index e4ac9dd..56d664a 100644 --- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec @@ -67,6 +67,9 @@ Requires: trinity-twin +Obsoletes: trinity-style-ia-ora < %{version}-%{release} +Provides: trinity-style-ia-ora = %{version}-%{release} + %description Mandriva theme for Trinity |
||
706d6bb5 | 2016-11-07 14:03:13 | François Andriot |
RPM packaging: update build scripts |
||
M redhat/Makefile.r14 M redhat/build/get_rpm_package_name.sh M redhat/build/update_repository.sh M redhat/buildenv.sh |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index f235364..2410c34 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -53,7 +53,7 @@ libcarddav: tqtinterface autoconf libcurl $(call buildpkg,dependencies/libcarddav) - + libr: $(call buildpkg,dependencies/libr) @@ -289,7 +289,10 @@ $(call buildpkg,libraries/libksquirrel) libtdeldap: tqtinterface +# Do NOT build on PCLOS +ifeq ($(wildcard /etc/pclinuxos-release),) $(call buildpkg,libraries/libtdeldap) +endif libtqt-perl: tqtinterface $(call buildpkg,libraries/libtqt-perl) @@ -401,13 +404,22 @@ $(call buildpkg,applications/kcmautostart) kcmldap: tdebase libtdeldap +# Do NOT build on CentOS 5, PCLinuxOS +ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),) $(call buildpkg,applications/kcmldap) +endif kcmldapcontroller: tdebase kcmldap +# Do NOT build on CentOS 5, PCLinuxOS +ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),) $(call buildpkg,applications/kcmldapcontroller) +endif kcmldapmanager: tdebase kcmldap +# Do NOT build on CentOS 5, PCLinuxOS +ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),) $(call buildpkg,applications/kcmldapmanager) +endif kcpuload: tdebase $(call buildpkg,applications/kcpuload) @@ -431,7 +443,10 @@ $(call buildpkg,applications/keep) kerberostray: tdebase +# Do NOT build on CentOS 5, PCLinuxOS +ifeq ($(wildcard /boot/vmlinuz*.el5* /etc/pclinuxos-release),) $(call buildpkg,applications/kerberostray) +endif kerry: tdebase $(call buildpkg,applications/kerry) @@ -684,7 +699,10 @@ $(call buildpkg,applications/tdmtheme) tellico: tdebase +# Do NOT build on CentOS 5 +ifeq ($(wildcard /boot/vmlinuz*.el5*),) $(call buildpkg,applications/tellico) +endif tork: tdebase torsocks $(call buildpkg,applications/tork) diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index ca8303a..f5c4c63 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -24,7 +24,7 @@ # Most TDE libraries have no prefix #"libkdcraw") PREFIX="";; # 3rd party dependencies - "dirmngr"|"esound"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3"|"tar") PREFIX="";; + "dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3"|"tar") PREFIX="";; # Extra build stuff "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; # Other @@ -94,7 +94,7 @@ "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";; "esound") PKGDEVEL="esound-devel";; "imlib1") PKGDEVEL="${lib}Imlib-devel";; - "pan") PKGDEVEL="uulib-devel";; + "koffice") PKGDEVEL="koffice-devel";; "libart-lgpl") PKGDEVEL="libart_lgpl-devel";; "libcaldav") PKGDEVEL="${lib}caldav-devel";; "libcarddav") PKGDEVEL="${lib}carddav-devel";; @@ -102,6 +102,7 @@ "libkexiv2") PKGDEVEL="${lib}kexiv2-devel";; "libkipi") PKGDEVEL="${lib}kipi-devel";; "libr") PKGDEVEL="${lib}r-devel";; + "pan") PKGDEVEL="uulib-devel";; "tqca") PKGDEVEL="${lib}tqca-devel";; "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";; "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers ${lib}tqt3-mt-sqlite3";; diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh index 72a142d..fafb66e 100755 --- a/redhat/build/update_repository.sh +++ b/redhat/build/update_repository.sh @@ -16,16 +16,16 @@ [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}" if [ -x /usr/bin/dnf ]; then - REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean all --disablerepo="*" --enablerepo="rpmbuild*")' + REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean expire-cache --disablerepo="*" --enablerepo="rpmbuild*")' elif [ -x /usr/sbin/urpmi ]; then REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)' elif [ -x /usr/bin/zypper ]; then REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)' elif [ -x /usr/bin/yum ]; then if [ "$(rpm -E %dist)" = ".el5" ]; then - REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")' + REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' else - REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")' + REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")' fi elif [ -x /usr/bin/apt-get ]; then REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)' diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index 4b8e8e9..7505ef9 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -83,7 +83,7 @@ done < submodules } -alias rr='rpm -qa --qf "%{name} %{buildhost}\n" | grep "\.vtf" | awk "{print \$1}"' +alias rr='rpm -qa --qf "%{name}|%{buildhost}|%{packager}\n" | grep -e "\(\.vtf\|andriot\)"|cut -d"|" -f1 | sort' # Update main repository alias tdu='(export GIT_ASKPASS=/bin/true; cd ~/tde/tde_r14; ./scripts/switch_all_submodules_to_head_and_clean)' |
||
e55c122e | 2016-11-07 14:03:33 | François Andriot |
RPM packaging: fix tdemultimedia buildrequires gstreamer on pclinuxos |
||
M redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec |
||
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec index 0d3b380..eba23f0 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0.spec @@ -135,11 +135,7 @@ # GSTREAMER support %if 0%{?mgaversion} || 0%{?mdkversion} -%if 0%{?pclinuxos} -BuildRequires: libgstreamer1.0-devel -%else BuildRequires: %{_lib}gstreamer1.0-devel -%endif %endif %if 0%{?rhel} || 0%{?fedora} BuildRequires: gstreamer-devel |
||
54dcc679 | 2016-11-07 14:03:57 | François Andriot |
RPM packaging: fix meta package dependencies |
||
M redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec |
||
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index b1602ab..5a27ceb 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -118,8 +118,6 @@ Requires: trinity-dolphin Requires: trinity-filelight Requires: trinity-gwenview -Requires: trinity-k3b -Requires: trinity-k9copy Requires: trinity-kaffeine Requires: trinity-kaffeine-mozilla Requires: trinity-kasablanca @@ -131,20 +129,15 @@ Requires: trinity-kbookreader Requires: trinity-kchmviewer Requires: trinity-kcmautostart -Requires: trinity-kcmldap -Requires: trinity-kcmldapcontroller -Requires: trinity-kcmldapmanager Requires: trinity-kcpuload Requires: trinity-kdbg Requires: trinity-kdbusnotification Requires: trinity-kdiff3 Requires: trinity-kdirstat Requires: trinity-keep -Requires: trinity-kerberostray Requires: trinity-keximdb Requires: trinity-kftpgrabber Requires: trinity-kile -Requires: trinity-kima Requires: trinity-kiosktool Requires: trinity-kkbswitch Requires: trinity-klcddimmer @@ -204,7 +197,6 @@ Requires: trinity-tderadio Requires: trinity-tdesvn Requires: trinity-tdmtheme -Requires: trinity-tellico Requires: trinity-tork Requires: trinity-twin-style-crystal Requires: trinity-wlassistant @@ -215,9 +207,24 @@ Requires: trinity-tdesudo %endif -# RHEL5: pilot library is too old +# PCLinuxOS and RHEL 5 don't have heimdal ... %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?pclinuxos} == 0 +Requires: trinity-kcmldap +Requires: trinity-kcmldapcontroller +Requires: trinity-kcmldapmanager +Requires: trinity-kerberostray +%endif +%endif + +# RHEL5: UDEV is too old +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +Requires: trinity-k3b +Requires: trinity-k9copy +Requires: trinity-kima Requires: trinity-kpilot +Requires: trinity-tellico +Requires: trinity-tdepowersave %endif # Network management @@ -234,7 +241,6 @@ # Power management Obsoletes: trinity-tde-guidance-powermanager -Requires: trinity-tdepowersave # Decoration-related stuff (not installed by default) #Requires: trinity-kgtk-qt3 @@ -292,7 +298,6 @@ Requires: trinity-kdevmon Requires: trinity-kdissert Requires: trinity-klamav -Requires: trinity-klibido Requires: trinity-knoda Requires: trinity-kompose Requires: trinity-koverartist ** Diff limit reached (max: 250 lines) ** |