10d8be91 | 2015-11-06 15:58:52 | François Andriot |
RPM packaging: updates dependencies for 14.0.2 |
||
M redhat/Makefile.r14 M redhat/buildenv.sh M redhat/dependencies/akode/akode-14.0.0.spec M redhat/dependencies/arts/arts-14.0.0.spec M redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec M redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec M redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec M redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec M redhat/dependencies/libcaldav/libcaldav-14.0.0.spec M redhat/dependencies/libcarddav/libcarddav-14.0.0.spec M redhat/dependencies/python-tqt/python-tqt-14.0.0.spec M redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec M redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec M redhat/dependencies/tqca/tqca-14.0.0.spec M redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec M redhat/dependencies/tqt3/tqt3-14.0.0.spec M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec M redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo M redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo M redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec R redhat/genrpm.sh |
||
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index f9e894c..71f42c3 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -1,7 +1,7 @@ SHELL := /bin/bash PACKAGING_DIR := $(shell cd ..; pwd) PATH := $(PATH):$(shell pwd)/build -TDE_VERSION := 14.0.0 +TDE_VERSION := 14.0.2 buildpkg = \ @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \ diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index 5c3febc..705d479 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -3,7 +3,7 @@ # This file can be sourced in your .bashrc TDE_BASEDIR=~/tde -[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.1" +[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.2" TDE_GITBASESRC=${TDE_BASEDIR}/tde_r14 TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION} @@ -19,7 +19,7 @@ alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}' # Build a single tarball (execute from GIT directory) -alias tdp4='TARGET=14.0.1 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball' +alias tdp4='TARGET=14.0.2 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball' # Rebuild all tarballs if [ -x /usr/bin/pigz ]; then @@ -38,17 +38,17 @@ } grp4() { - build_rpm_package.sh "${1}" "14.0.1" + build_rpm_package.sh "${1}" "14.0.2" } # Check if tarballs are more recent than installed packages checknew() { - find ~/tde/tde-tarballs/14.0.1 -name "trinity-*.tar.gz" | while read f; do + find ~/tde/tde-tarballs/14.0.2 -name "trinity-*.tar.gz" | while read f; do TAR="${f##*/}" NAME="${TAR%-*}" if rpm -q "${NAME}" &>/dev/null; then - set $(rpm -q --qf "%{name} 14.0.1 %{release}" ${NAME} ) + set $(rpm -q --qf "%{name} 14.0.2 %{release}" ${NAME} ) B="$1-$2~${3#*_}" A=${TAR%.tar.gz} B=${B%.opt} diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec index 3c9b063..a6ddf04 100644 --- a/redhat/dependencies/akode/akode-14.0.0.spec +++ b/redhat/dependencies/akode/akode-14.0.0.spec @@ -43,11 +43,11 @@ %endif Name: trinity-akode -Summary: Audio-decoding framework -Group: System Environment/Libraries Epoch: %{tde_epoch} Version: 2.0.2 -Release: 1%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Audio-decoding framework +Group: System Environment/Libraries URL: http://www.kde-apps.org/content/show.php?content=30375 #URL: http://carewolf.com/akode/ @@ -57,7 +57,7 @@ License: GPLv2+ %endif -Source0: akode-%{tde_version}.tar.gz +Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -162,7 +162,7 @@ Group: Development/Libraries Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %{?_with_jack:Requires: %{libakode}_jack_sink = %{?epoch:%{epoch}:}%{version}-%{release}} -%{?_with_pulseaudio:Requires: %{libakode}_polyp_sink = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?_with_pulseaudio:Requires: %{libakode}_pulse_sink = %{?epoch:%{epoch}:}%{version}-%{release}} %{?_with_libsamplerate:Requires: %{libakode}_src_resampler = %{?epoch:%{epoch}:}%{version}-%{release}} %{?_with_libmad:Requires: %{libakode}_mpeg_decoder = %{?epoch:%{epoch}:}%{version}-%{release}} Requires: pkgconfig @@ -215,25 +215,25 @@ %if "%{?_with_pulseaudio}" != "" -%package -n %{libakode}_polyp_sink +%package -n %{libakode}_pulse_sink Summary: Pulseaudio output backend for %{name} Group: Development/Libraries -Provides: libakode_polyp_sink = %{version}-%{release} +Provides: libakode_pulse_sink = %{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n %{libakode}_polyp_sink +%description -n %{libakode}_pulse_sink This package contains the pulseaudio backend for Akode. Recommended for network transparent audio. -%files -n %{libakode}_polyp_sink +%files -n %{libakode}_pulse_sink %defattr(-,root,root,-) -%{_libdir}/libakode_polyp_sink.la -%{_libdir}/libakode_polyp_sink.so +%{_libdir}/libakode_pulse_sink.la +%{_libdir}/libakode_pulse_sink.so -%post -n %{libakode}_polyp_sink +%post -n %{libakode}_pulse_sink /sbin/ldconfig -%postun -n %{libakode}_polyp_sink +%postun -n %{libakode}_pulse_sink /sbin/ldconfig %endif @@ -300,7 +300,7 @@ ########## %prep -%setup -q -n akode-2.0.2 +%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %build diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec index 499cb1f..f049711 100644 --- a/redhat/dependencies/arts/arts-14.0.0.spec +++ b/redhat/dependencies/arts/arts-14.0.0.spec @@ -42,7 +42,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 1.5.10 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: ARTS (analog realtime synthesizer) - the TDE sound system Group: System Environment/Daemons URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec index 06e8dea..790532b 100644 --- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec +++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec @@ -31,7 +31,7 @@ Name: trinity-avahi-tqt Epoch: %{tde_epoch} Version: 0.6.30 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Avahi TQt integration library Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec index b855895..3370356 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -31,7 +31,7 @@ Name: trinity-dbus-1-tqt Epoch: %{tde_epoch} Version: 0.9 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Dbus bindings for the Trinity Qt [TQt] interface Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec index b2a45cb..8a8c1b2 100644 --- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec @@ -31,7 +31,7 @@ Name: trinity-dbus-tqt Epoch: %{tde_epoch} Version: 0.63 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: Simple inter-process messaging system Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec index b178fff..36816cd 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec @@ -29,12 +29,13 @@ %endif -Name: trinity-libart-lgpl -Version: 2.3.22 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} -Summary: Library of functions for 2D graphics -Group: System/Libraries -URL: http://www.trinitydesktop.org/ +Name: trinity-libart-lgpl +Epoch: %{tde_epoch} +Version: 2.3.22 +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Summary: Library of functions for 2D graphics +Group: System/Libraries +URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} License: LGPL-2.0+ @@ -95,8 +96,8 @@ %package -n %{libart}_lgpl-devel Summary: Library of functions for 2D graphics - development files Group: Development/Libraries -Provides: libart_lgpl-devel = %{version}-%{release} -Requires: %{libart}_lgpl_2-2 = %{version}-%{release} +Provides: libart_lgpl-devel = %{tde_epoch}:%{version}-%{release} +Requires: %{libart}_lgpl_2-2 = %{tde_epoch}:%{version}-%{release} %description -n %{libart}_lgpl-devel A library of functions for 2D graphics supporting a superset of the diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 8845fb7..fb01bb0 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A client library that adds support for the CalDAV protocol (rfc4791) Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec index e9c111d..9ec474a 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec @@ -35,7 +35,7 @@ Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} Version: 0.6.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} +Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Summary: A portable CardDAV client implementation Group: System/Libraries URL: http://www.trinitydesktop.org/ diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec ** Diff limit reached (max: 250 lines) ** |