RPM Packaging: updates

pull/3/head
François Andriot 10 years ago
parent bfa5b7797e
commit fc95500166

@ -48,7 +48,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: flex-devel
#BuildRequires: flex-devel
BuildRequires: gettext
BuildRequires: pilot-link-devel >= 0.12
BuildRequires: trinity-tdepim-devel >= %{tde_version}

@ -13,6 +13,8 @@ case ${PKGNAME} in
"qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;
"curl") PKGNAME="trinity-libcurl";;
"esound") PKGNAME="esound-libs";;
"tqt3") PKGNAME="libtqt3-mt";;
"tqtinterface") PKGNAME="libtqt4";;
esac
VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null)

@ -14,6 +14,8 @@ RPMDIR_NOARCH=${RPMDIR}/noarch
RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}"
case "${PKGNAME##*/}" in
"tqt3") PKGNAME="libtqt3-mt";;
"tqtinterface") PKGNAME="libtqt4";;
"koffice") PKGNAME="koffice-suite";;
"tde-i18n") PKGNAME="tde-i18n-French";;
esac

@ -17,11 +17,13 @@ DEVEL="$2"
case "${PKGNAME}" in
"k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
"koffice") PKGNAME="${PKGNAME}-suite";;
"tqt3") PKGNAME="libtqt3-mt";;
"tqtinterface") PKGNAME="libtqt4";;
esac
# Use the Trinity Prefix, or not.
case "${PKGNAME}" in
"trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";;
"trinity-"*|"qt3"|"python-qt3"|"esound"|"lib"*) PREFIX="";;
"autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
"curl") PREFIX="trinity-lib";;
*) PREFIX="trinity-";;

@ -36,12 +36,17 @@ Name: trinity-arts
Epoch: 1
Version: 1.5.10
Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
License: GPL-2.0+
Summary: aRts (analog realtime synthesizer) - the TDE sound system
Group: System Environment/Daemons
Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
@ -96,7 +101,7 @@ BuildRequires: libtool
%endif
# MAD support
%ifarch i586 i686 x86_64
%ifarch i386 i486 i586 i686 x86_64
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%define with_libmad 1
%if 0%{?mdkversion} || 0%{?mgaversion}

@ -1,98 +1,128 @@
#
# spec file for package dbus-tqt
#
# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
#
# TDE specific building variables
%define tde_version 14.0.0
%define tde_prefix /usr
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-dbus-tqt
Epoch: 2
Version: 0.63
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL
Summary: Dbus TQT Interface
Group: System Environment/Libraries
Summary: Simple inter-process messaging system
Group: System/Libraries
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# [dbus-tqt] Fix build on RHEL 4
Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch
BuildRequires: libtqt3-mt-devel >= 3.5.0
BuildRequires: libtqt4-devel >= 1:4.2.0
BuildRequires: gcc-c++
BuildRequires: cmake >= 2.8
# DBUS support
%if 0%{?suse_version}
BuildRequires: dbus-1-devel
%else
BuildRequires: dbus-devel
%endif
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0
Requires: trinity-tqt3 >= 3.5.0
%description
Obsoletes: dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
##########
%package -n libdbus-tqt-1
Summary: Simple inter-process messaging system (TQt-based shared library)
Group: System/Libraries
%description
Dbus TQT Interface
Obsoletes: trinity-dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%description -n libdbus-tqt-1
D-BUS is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
This package provides the TQt-based shared library for applications using the
Qt interface to D-BUS.
See the dbus description for more information about D-BUS in general.
%post
%post -n libdbus-tqt-1
/sbin/ldconfig || :
%postun
%postun -n libdbus-tqt-1
/sbin/ldconfig || :
%files
%files -n libdbus-tqt-1
%defattr(-,root,root,-)
%{tde_libdir}/libdbus-tqt-1.so.0
%{tde_libdir}/libdbus-tqt-1.so.0.0.0
%{_libdir}/libdbus-tqt-1.so.0
%{_libdir}/libdbus-tqt-1.so.0.0.0
##########
%package devel
Requires: %{name}
Summary: %{name} - Development files
%package -n libdbus-tqt-1-devel
Requires: libdbus-tqt-1 = %{?epoch:%{epoch}:}%{version}-%{release}
Summary: Simple inter-process messaging system (TQt interface)
Group: Development/Libraries
Obsoletes: dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: trinity-dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: trinity-dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
%description -n libdbus-tqt-1-devel
Development files for %{name}
%post devel
%post -n libdbus-tqt-1-devel
/sbin/ldconfig || :
%postun devel
%postun -n libdbus-tqt-1-devel
/sbin/ldconfig || :
%files devel
%files -n libdbus-tqt-1-devel
%defattr(-,root,root,-)
%{tde_includedir}/dbus-1.0/*
%{tde_libdir}/libdbus-tqt-1.so
%{tde_libdir}/libdbus-tqt-1.la
%{tde_libdir}/pkgconfig/dbus-tqt.pc
%{_includedir}/dbus-1.0/*
%{_libdir}/libdbus-tqt-1.so
%{_libdir}/libdbus-tqt-1.la
%{_libdir}/pkgconfig/dbus-tqt.pc
##########
%if 0%{?suse_version} || 0%{?pclinuxos}
%if 0%{?pclinuxos}
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 4
%patch1 -p1 -b .dbustypes
%endif
%build
unset QTDIR QTINC QTLIB
@ -115,8 +145,8 @@ fi
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=OFF \
\
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DINCLUDE_INSTALL_DIR=%{_includedir} \
-DLIB_INSTALL_DIR=%{_libdir} \
..
%__make %{?_smp_mflags}

@ -20,16 +20,25 @@
Name: trinity-tqt3
Epoch: 0
Version: 3.5.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL-2.0+
Summary: TQt GUI Library, Version 3
Group: System/GUI/Other
Url: http://www.trinitydesktop.org/
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{tde_version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: assistant-tqt3.desktop
Source2: designer-tqt3.desktop
@ -52,7 +61,6 @@ BuildRequires: freetype-devel
BuildRequires: fontconfig-devel
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: desktop-file-utils
# CUPS support
BuildRequires: cups-devel
@ -861,7 +869,7 @@ or automake.
%{_libdir}/tqt3/plugins/designer/libkdevdlgplugin.so
%{_libdir}/tqt3/plugins/designer/librcplugin.so
%{_libdir}/tqt3/plugins/designer/libwizards.so
%{_datadir}/applications/designer-tqt3.desktop
#%{_datadir}/applications/designer-tqt3.desktop
%dir %{_datadir}/tqt3/tools/tqtconv2ui
%{_datadir}/tqt3/tools/tqtconv2ui/main.cpp
%{_datadir}/tqt3/tools/tqtconv2ui/tqtconv2ui.pro
@ -932,7 +940,7 @@ development files by the translator.
%{_datadir}/tqt3/phrasebooks/*
%{_datadir}/tqt3/doc/html/linguist*html
%{_datadir}/tqt3/doc/html/linguist*dcf
%{_datadir}/applications/linguist-tqt3.desktop
#%{_datadir}/applications/linguist-tqt3.desktop
%dir %{_docdir}/tqt3-linguist
%{_docdir}/tqt3-linguist/qt_untranslated.ts
@ -957,7 +965,7 @@ the package tqt3-apps-devel.
%files -n tqt3-assistant
%{_bindir}/tqassistant
%{_datadir}/applications/assistant-tqt3.desktop
#%{_datadir}/applications/assistant-tqt3.desktop
%{_datadir}/tqt3/doc/html/assistant*html
%{_datadir}/tqt3/doc/html/assistant*dcf
@ -980,7 +988,7 @@ install this package.
%files -n tqt3-qtconfig
%defattr(-,root,root,-)
%{_bindir}/tqtconfig
%{_datadir}/applications/tqt3config.desktop
#%{_datadir}/applications/tqt3config.desktop
###########
@ -1294,10 +1302,10 @@ for i in designer/designer assistant linguist/linguist; do
done
# desktop lnk files
install -m644 -D "%{SOURCE1}" "%{?buildroot}%{_datadir}/applications/assistant-tqt3.desktop"
install -m644 -D "%{SOURCE2}" "%{?buildroot}%{_datadir}/applications/designer-tqt3.desktop"
install -m644 -D "%{SOURCE3}" "%{?buildroot}%{_datadir}/applications/linguist-tqt3.desktop"
install -m644 -D "%{SOURCE4}" "%{?buildroot}%{_datadir}/applications/tqt3config.desktop"
#install -m644 -D "%{SOURCE1}" "%{?buildroot}%{_datadir}/applications/assistant-tqt3.desktop"
#install -m644 -D "%{SOURCE2}" "%{?buildroot}%{_datadir}/applications/designer-tqt3.desktop"
#install -m644 -D "%{SOURCE3}" "%{?buildroot}%{_datadir}/applications/linguist-tqt3.desktop"
#install -m644 -D "%{SOURCE4}" "%{?buildroot}%{_datadir}/applications/tqt3config.desktop"
# build attic package and copy it to libtqt3-compat-headers
pushd src

@ -27,17 +27,26 @@ Name: trinity-tqtinterface
Epoch: 1
Version: 4.2.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL-2.0+
Summary: The Trinity Qt Interface Libraries
Group: System/GUI/Other
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: libtqt3-mt-devel >= 3.5.0
BuildRequires: tqt3-dev-tools >= 3.5.0
%if 0%{?suse_version} && 0%{?suse_version} < 1300
BuildRequires: trinity-cmake-macros
@ -126,6 +135,7 @@ Group: Development/Libraries
Summary: The Trinity Qt Interface Libraries (Development Files)
Requires: libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libtqt3-mt-devel >= 3.5.0
Requires: tqt3-dev-tools >= 3.5.0
%if 0%{?suse_version} && 0%{?suse_version} < 1300
Requires: trinity-cmake-macros

Loading…
Cancel
Save