diff options
| -rw-r--r-- | redhat/applications/k3b/trinity-k3b-3.5.12.spec | 2 | ||||
| -rw-r--r-- | redhat/applications/konversation/trinity-konversation-3.5.13.spec | 132 | ||||
| -rw-r--r-- | redhat/components.txt | 3 | ||||
| -rwxr-xr-x | redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec | 6 | ||||
| -rwxr-xr-x | redhat/genrpm.sh | 104 | ||||
| -rw-r--r--[-rwxr-xr-x] | redhat/kdebase/plasma-desktop | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | redhat/kdebase/trinity-kdebase-3.5.12.spec | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | redhat/kdebase/trinity-kdebase-3.5.13.spec | 0 | ||||
| -rwxr-xr-x | redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 2 | ||||
| -rw-r--r-- | redhat/qt3/qt3.spec | 4 |
10 files changed, 203 insertions, 50 deletions
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec index e58543d38..a1b9f0d60 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec @@ -268,7 +268,7 @@ update-desktop-database -q &> /dev/null * Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 - Add i18n translations - Add patches from RHEL 6.0 (except Patch106, redundant with our 'patch0') -- Renamed 'patch0' (Thales) to 'patch106' +- Renamed 'patch0' to 'patch106' * Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1 - Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3) diff --git a/redhat/applications/konversation/trinity-konversation-3.5.13.spec b/redhat/applications/konversation/trinity-konversation-3.5.13.spec new file mode 100644 index 000000000..2b9d0c192 --- /dev/null +++ b/redhat/applications/konversation/trinity-konversation-3.5.13.spec @@ -0,0 +1,132 @@ +# Default version for this component +%define kdecomp konversation +%define version 1.1 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: user friendly Internet Relay Chat (IRC) client for KDE [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot <francois.andriot@free.fr> +URL: http://www.trinitydesktop.org/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: libxslt +BuildRequires: docbook-style-xsl +BuildRequires: libXi-devel + + +%description +Konversation is a client for the Internet Relay Chat (IRC) protocol. +It is easy to use and well-suited for novice IRC users, but novice +and experienced users alike will appreciate its many features: + + * Standard IRC features + * Easy to use graphical interface + * Multiple server and channel tabs in a single window + * IRC color support + * Pattern-based message highlighting and OnScreen Display + * Multiple identities for different servers + * Multi-language scripting support (with DCOP) + * Customizable command aliases + * NickServ-aware log-on (for registered nicknames) + * Smart logging + * Traditional or enhanced-shell-style nick completion + * DCC file transfer with resume support + + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +sed -i admin/acinclude.m4.in \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR || : ; source /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/applications/*/*.desktop +%{_datadir}/locale/*/LC_MESSAGES/konversation.mo +%{_datadir}/config.kcfg/konversation.kcfg +%{_datadir}/services/*.protocol +#%{_datadir}/servicetypes/digikamimageplugin.desktop +%{_datadir}/apps/*/ +%{_docdir}/HTML/*/konversation/ +%{_datadir}/icons/*/*/*/* +#%{_mandir}/man*/* + +%Changelog +* Mon Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 1.1-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + diff --git a/redhat/components.txt b/redhat/components.txt index 7c96d0c4e..e36cea517 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -1,6 +1,6 @@ +qt3 dependencies/libcaldav dependencies/libcarddav -dependencies/qt3 dependencies/tqtinterface dependencies/dbus-tqt dependencies/arts @@ -47,3 +47,4 @@ applications/kmymoney2 applications/kstreamripper applications/kdesudo applications/digikam +applications/konversation diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec index 6f65fa7bf..a63e8a814 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 1 +%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -50,6 +50,7 @@ Trinity QT Interface Group: Development/Libraries Summary: %{name} - Development files Requires: %{name} = %{version}-%{release} +Requires: qt3-devel >= 3.3.8d %description devel Development files for %{name} @@ -109,6 +110,9 @@ done %changelog +* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 +- Add missing Requires + * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 - Initial release for RHEL 6, RHEL 5 and Fedora 15 diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index eb7015de2..25ea69be1 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -1,7 +1,14 @@ #!/bin/bash cd "$( dirname "$0" )" -ARGS="$@" + +while [ $# -gt 0 ]; do + case "$1" in + "--auto") AUTO=1;; + *) COMP="$1";; + esac + shift +done clear cat <<EOF @@ -22,40 +29,43 @@ EOF exit 1 fi -select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do - # Gets package version from 'components.txt' file - VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt ) - - # If no version is set in text file, get version number from source tarball name - if [ -z "${VERSION}" ]; then - set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz) - if [ $# -gt 1 ]; then - select VERSION in $*; do break; done - elif [ -r "${COMP}/$1" ]; then - VERSION="$1" - else - echo "No source tarball found for '${COMP}' !" - continue - fi - VERSION="${VERSION##${COMP##*/}-}" - VERSION="${VERSION%%.tar.gz}" - # If version is defined in spec file: appends the date - else - VERSION="${VERSION}.$(date +%Y%m%d)" - fi +if [ -z "${COMP}" ]; then + select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do break; done +fi + +# Gets package version from 'components.txt' file +VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt ) - # Chooses a spec file (if many) - set $( cd "${COMP}"; echo *.spec ) +# If no version is set in text file, get version number from source tarball name +if [ -z "${VERSION}" ]; then + set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz) if [ $# -gt 1 ]; then - select SPEC in $*; do break; done + select VERSION in $*; do break; done elif [ -r "${COMP}/$1" ]; then - SPEC="$1" + VERSION="$1" else - echo "Fatal: no spec file found !" - exit 2 + echo "No source tarball found for '${COMP}' !" + continue fi + VERSION="${VERSION##${COMP##*/}-}" + VERSION="${VERSION%%.tar.gz}" +# If version is defined in spec file: appends the date +else + VERSION="${VERSION}.$(date +%Y%m%d)" +fi - cat <<EOF +# Chooses a spec file (if many) +set $( cd "${COMP}"; echo *.spec ) +if [ $# -gt 1 ]; then + select SPEC in $*; do break; done +elif [ -r "${COMP}/$1" ]; then + SPEC="$1" +else + echo "Fatal: no spec file found !" + exit 2 +fi + +cat <<EOF About to build '${COMP}': Version: '${VERSION}' @@ -63,22 +73,26 @@ About to build '${COMP}': Press ENTER to build, or CTRL+C to abort. EOF - read rep +[ -z "${AUTO}" ] && read rep - # Specific prefix for installation of some components - case "${COMP##*/}" in - "qt3") PREFIX="/usr";; - esac +# Specific prefix for installation of some components +case "${COMP##*/}" in + "qt3") PREFIX="/usr";; +esac - set -x - ( - rpmbuild -ba \ - --define "_sourcedir ${PWD}/${COMP}" \ - --define "_prefix ${PREFIX:-/opt/trinity}" \ - --define "version ${VERSION:-3.5.13}" \ - $ARGS \ - ${COMP}/${SPEC} || exit 1 - ) 2>&1 | tee /tmp/log - set +x -done +# Determines if we are running an i386 or x86_64 distro +if [ "$(rpm -q --qf '%{arch}' kernel)" = "i686" ]; then + ARGS="${ARGS} --target=i686" +fi + +set -x +( +rpmbuild -ba \ + --define "_sourcedir ${PWD}/${COMP}" \ + --define "_prefix ${PREFIX:-/opt/trinity}" \ + --define "version ${VERSION:-3.5.13}" \ + $ARGS \ + ${COMP}/${SPEC} || exit 1 +) 2>&1 | tee /tmp/log +set +x diff --git a/redhat/kdebase/plasma-desktop b/redhat/kdebase/plasma-desktop index 9e14070d8..9e14070d8 100755..100644 --- a/redhat/kdebase/plasma-desktop +++ b/redhat/kdebase/plasma-desktop diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index 3229fe15d..3229fe15d 100755..100644 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec index 967f8f3cf..967f8f3cf 100755..100644 --- a/redhat/kdebase/trinity-kdebase-3.5.13.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index faccf03ca..5c2652f17 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -55,6 +55,8 @@ BuildRequires: avahi-qt3-devel BuildRequires: jasper-devel BuildRequires: libtiff-devel BuildRequires: OpenEXR-devel +BuildRequires: libtool-ltdl-devel +BuildRequires: glib2-devel Requires: tqtinterface Requires: trinity-arts diff --git a/redhat/qt3/qt3.spec b/redhat/qt3/qt3.spec index 462703918..ad8ae872f 100644 --- a/redhat/qt3/qt3.spec +++ b/redhat/qt3/qt3.spec @@ -1,6 +1,6 @@ # Default version for this component %if "%{?version}" == "" -%define version 3.3.8.d +%define version 3.3.8d %endif # The following QT4 packages should NOT be installed to @@ -30,7 +30,7 @@ Provides: qt = 1:%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-3.3.8b.tar.gz -Source0: %{name}-%{version}.tar.gz +Source0: qt3-3.3.8.d.tar.gz Source2: qt.sh Source3: qt.csh Source4: designer3.desktop |