diff options
| -rw-r--r-- | redhat/Makefile.r14 | 2 | ||||
| -rw-r--r-- | redhat/applications/smartcardauth/smartcardauth-14.0.0.spec | 9 | ||||
| -rwxr-xr-x | redhat/build/build_rpm_package.sh | 4 | ||||
| -rwxr-xr-x | redhat/build/get_source_files.sh | 3 | ||||
| -rw-r--r-- | redhat/buildenv.sh | 10 | ||||
| -rw-r--r-- | redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec | 2 |
6 files changed, 16 insertions, 14 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 4ad1c8649..1b9e44d82 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.0 buildpkg = \ @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \ diff --git a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec index 4176d716d..75d7e35b6 100644 --- a/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec +++ b/redhat/applications/smartcardauth/smartcardauth-14.0.0.spec @@ -53,6 +53,8 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source1: trinity-%{tde_pkg}-rpmlintrc +Patch0: %{tde_pkg}-%{tde_version}.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -135,6 +137,7 @@ in addition to the PKCS certificate functionality %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .ftbfs %__sed -i "Makefile" \ -e "s|/usr/lib/perl5/Chipcard|%{_libdir}/perl5/vendor_perl/Chipcard|g" @@ -143,10 +146,8 @@ in addition to the PKCS certificate functionality %build export PATH="%{tde_bindir}:${PATH}" -export CFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}" -export CXXFLAGS="${CXXFLAGS} ${RPM_OPT_FLAGS}" - -./build_ckpasswd +cd src +make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %install diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 7c4609e8a..2071ab445 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -56,8 +56,8 @@ fi if [ -r "${TEMPDIR}/one.patch" ]; then sed -i "${TEMPDIR}/"*.spec \ - -e "/^Source0:/ s/$/\nPatch0: one.patch/" \ - -e "/%setup/ s/$/\n%patch0 -p1/" + -e "/^Source0:/ s/$/\nPatch389: one.patch/" \ + -e "/%setup/ s/$/\n%patch389 -p1/" fi [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}" diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 03a3598a0..bec678217 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -6,6 +6,7 @@ TDE_VERSION="${2:-14.0.0}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) SPECDIR="${SPECFILE%/*}" +RPMPKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" [ ! -r "${SPECFILE}" ] && exit 2 @@ -13,7 +14,7 @@ while read var val; do case "${var}" in Version:*) VERSION="${val}";; Source[0-9]*:|Source:|Patch[0-9]*:) - FILE=$(rpm --define "tde_pkg ${PKGNAME}" --define "tde_version ${TDE_VERSION}" --define "name ${PKGNAME}" --define "version ${VERSION}" -E "${SPECDIR}/${val##*/}") + FILE=$(rpm --define "tde_pkg ${PKGNAME}" --define "tde_version ${TDE_VERSION}" --define "name ${RPMPKGNAME}" --define "version ${VERSION}" -E "${SPECDIR}/${val##*/}") if [ -r "${FILE}" ]; then echo "${FILE}" else diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index 91a78b746..4bb1fc616 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -3,7 +3,7 @@ # This file can be sourced in your .bashrc TDE_BASEDIR=~/tde -TDE_VERSION=14.0.0 +TDE_VERSION=14.0.1 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 @@ export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )" alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}' # Build a single tarball (execute from GIT directory) -alias tdp4='TARGET=14.0.0 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball' +alias tdp4='TARGET=14.0.1 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 @@ grp3() { } grp4() { - build_rpm_package.sh "${1}" "14.0.0" + build_rpm_package.sh "${1}" "14.0.1" } # Check if tarballs are more recent than installed packages checknew() { - find ~/tde/tde-tarballs/14.0.0 -name "trinity-*.tar.gz" | while read f; do + find ~/tde/tde-tarballs/14.0.1 -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.0 %{release}" ${NAME} ) + set $(rpm -q --qf "%{name} 14.0.1 %{release}" ${NAME} ) B="$1-$2~${3#*_}" A=${TAR%.tar.gz} B=${B%.opt} diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec index 1d7014ad5..f6e1b2616 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec @@ -211,7 +211,7 @@ This package installs the Trinity directory structure. for t in crystalsvg hicolor locolor ; do %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}" %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable" - for i in {16,22,32,48,64,128} ; do + for i in {16,22,32,48,64,128,256} ; do %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}" done |