RPM Packaging: update dependencies

pull/3/head
François Andriot 12 years ago
parent 4e730af922
commit 5078e77785

@ -15,7 +15,8 @@
%define _docdir %{tde_datadir}/doc %define _docdir %{tde_datadir}/doc
Name: trinity-arts Name: trinity-arts
Version: %{tde_version} Epoch: 1
Version: 1.5.10
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: aRts (analog realtime synthesizer) - the TDE sound system Summary: aRts (analog realtime synthesizer) - the TDE sound system
@ -28,7 +29,7 @@ Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kcmartsrc-pulseaudio Source1: kcmartsrc-pulseaudio
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
@ -89,10 +90,7 @@ BuildRequires: libmad-devel
%define with_pulseaudio 1 %define with_pulseaudio 1
%endif %endif
# TDE 3.5.13 specific building variables Requires: trinity-tqtinterface >= %{tde_version}
BuildRequires: cmake >= 2.8
Requires: trinity-tqtinterface >= %{version}
Requires: audiofile Requires: audiofile
%if "%{?tde_prefix}" == "/usr" %if "%{?tde_prefix}" == "/usr"
@ -141,7 +139,7 @@ playing a wave file with some effects.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries
Summary: %{name} - Development files Summary: %{name} - Development files
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{?tde_prefix}" == "/usr" %if "%{?tde_prefix}" == "/usr"
Obsoletes: arts-devel Obsoletes: arts-devel
%endif %endif
@ -174,7 +172,7 @@ Development files for %{name}
%package config-pulseaudio %package config-pulseaudio
Group: System Environment/Daemons Group: System Environment/Daemons
Summary: %{name} - Default configuration file for Pulseaudio Summary: %{name} - Default configuration file for Pulseaudio
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%description config-pulseaudio %description config-pulseaudio
%{summary} %{summary}
@ -195,7 +193,7 @@ Requires: %{name} = %{version}-%{release}
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build %build
@ -204,11 +202,11 @@ Requires: %{name} = %{version}-%{release}
cd build cd build
%endif %endif
%cmake .. \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \
\ \
@ -223,7 +221,8 @@ cd build
-DWITH_VORBIS=ON \ -DWITH_VORBIS=ON \
%{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \ %{?with_libmad:-DWITH_MAD=ON} %{!?with_libmad:-DWITH_MAD=OFF} \
%{?with_esound:-DWITH_ESOUND=ON} \ %{?with_esound:-DWITH_ESOUND=ON} \
%{?with_jack:-DWITH_JACK=ON} %{?with_jack:-DWITH_JACK=ON} \
..
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make
@ -243,5 +242,5 @@ cd build
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.5.10-1
- Initial release for TDE R14.0.0 - Initial release for TDE R14.0.0

@ -1,20 +1,13 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
%define tde_version 14.0.0
# TDE specific building variables # TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_version 14.0.0
%define tde_prefix /usr
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-avahi-tqt Name: trinity-avahi-tqt
Version: %{tde_version} Epoch: 1
Version: 0.6.30
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Avahi TQT Interface Summary: Avahi TQT Interface
@ -27,7 +20,7 @@ URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
@ -62,10 +55,10 @@ BuildRequires: libexpat-devel
%endif %endif
Requires: trinity-tqt3 >= 3.5.0 Requires: trinity-tqt3 >= 3.5.0
Requires: trinity-tqtinterface >= %{version} Requires: trinity-tqtinterface >= %{tde_version}
Obsoletes: avahi-tqt < %{version}-%{release} Obsoletes: avahi-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: avahi-tqt = %{version}-%{release} Provides: avahi-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%description %description
@ -73,16 +66,16 @@ Avahi TQT Interface
%package devel %package devel
Requires: %{name}
Summary: %{name} - Development files Summary: %{name} - Development files
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
Provides: %{_lib}avahi-qt3-devel Provides: %{_lib}avahi-qt3-devel
%endif %endif
Obsoletes: avahi-tqt-devel < %{version}-%{release} Obsoletes: avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: avahi-tqt-devel = %{version}-%{release} Provides: avahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel %description devel
Development files for %{name} Development files for %{name}
@ -94,9 +87,7 @@ Development files for %{name}
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
unset QTDIR QTINC QTLIB
./autogen.sh ./autogen.sh
@ -153,5 +144,5 @@ unset QTDIR QTINC QTLIB
%{tde_libdir}/pkgconfig/avahi-tqt.pc %{tde_libdir}/pkgconfig/avahi-tqt.pc
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.30-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -1,20 +1,20 @@
# Always install under standard prefix # TDE specific building variables
%define tde_prefix /usr
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /usr
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-dbus-1-tqt Name: trinity-dbus-1-tqt
Version: 14.0.0 Epoch: 1
Version: 0.9
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Dbus TQT Interface Summary: Dbus TQT Interface
Group: System Environment/Libraries Group: System Environment/Libraries
Obsoletes: dbus-1-tqt < %{version}-%{release} Obsoletes: dbus-1-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: dbus-1-tqt = %{version}-%{release} Provides: dbus-1-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
Vendor: Trinity Project Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr> Packager: Francois Andriot <francois.andriot@free.fr>
@ -22,7 +22,7 @@ Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%if 0%{?suse_version} %if 0%{?suse_version}
@ -30,11 +30,10 @@ BuildRequires: dbus-1-devel
%else %else
BuildRequires: dbus-devel BuildRequires: dbus-devel
%endif %endif
BuildRequires: trinity-tqtinterface-devel >= %{version}
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
Requires: trinity-tqt3 >= 3.5.0 Requires: trinity-tqt3 >= 3.5.0
@ -60,8 +59,8 @@ Requires: %{name}
Summary: %{name} - Development files Summary: %{name} - Development files
Group: Development/Libraries Group: Development/Libraries
Obsoletes: dbus-1-tqt-devel < %{version}-%{release} Obsoletes: dbus-1-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: dbus-1-tqt-devel = %{version}-%{release} Provides: dbus-1-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel %description devel
Development files for %{name} Development files for %{name}
@ -87,7 +86,7 @@ Development files for %{name}
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%build %build
@ -100,6 +99,13 @@ cd build
%endif %endif
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \ -DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \
@ -118,5 +124,5 @@ cd build
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9-1
- Initial release for TDE R14.0.0 - Initial release for TDE R14.0.0

@ -1,11 +1,12 @@
# Always install under standard prefix # TDE specific building variables
%define tde_version 14.0.0
%define tde_prefix /usr %define tde_prefix /usr
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-dbus-tqt Name: trinity-dbus-tqt
Version: 14.0.0 Epoch: 1
Version: 0.63
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Dbus TQT Interface Summary: Dbus TQT Interface
@ -17,7 +18,7 @@ Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# [dbus-tqt] Fix build on RHEL 4 # [dbus-tqt] Fix build on RHEL 4
Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch Patch1: dbus-tqt-3.5.13-fix_old_dbus_types.patch
@ -30,14 +31,12 @@ BuildRequires: dbus-devel
%endif %endif
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{version}
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqt3-devel >= 3.5.0
Requires: trinity-tqt3 >= 3.5.0 Requires: trinity-tqt3 >= 3.5.0
Obsoletes: dbus-tqt < %{version}-%{release} Obsoletes: dbus-tqt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: dbus-tqt = %{version}-%{release} Provides: dbus-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
%description %description
@ -61,8 +60,8 @@ Requires: %{name}
Summary: %{name} - Development files Summary: %{name} - Development files
Group: Development/Libraries Group: Development/Libraries
Obsoletes: dbus-tqt-devel < %{version}-%{release} Obsoletes: dbus-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: dbus-tqt-devel = %{version}-%{release} Provides: dbus-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel %description devel
Development files for %{name} Development files for %{name}
@ -88,7 +87,7 @@ Development files for %{name}
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
%patch1 -p1 -b .dbustypes %patch1 -p1 -b .dbustypes
@ -133,5 +132,5 @@ cd build
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.63-1
- Initial release for TDE R14.0.0 - Initial release for TDE R14.0.0

@ -94,10 +94,12 @@ fi
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# Unwanted files
%__rm -f %{buildroot}%{tde_libdir}/*.a %__rm -f %{buildroot}%{tde_libdir}/*.a

@ -1,9 +1,7 @@
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define tde_version 14.0.0
# Always install under standard prefix %define tde_version 14.0.0
%define tde_prefix /usr %define tde_prefix /usr
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
@ -91,7 +89,7 @@ Requires: %{name} = %{version}-%{release}
%description tqtext %description tqtext
PyQt Extensions. Contains: PyQt Extensions. Contains:
* QScintilla: a featureful TQt source code editing component based * TQScintilla: a featureful TQt source code editing component based
on Scintilla. on Scintilla.
%files tqtext %files tqtext
@ -119,12 +117,12 @@ Linguist translation files from Python code.
%package devel %package devel
Summary: TQt bindings for Python - Development files Summary: TQt bindings for Python - Development files
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-tools = %{version}-%{release} Requires: trinity-pytqt-tools = %{version}-%{release}
%description devel %description devel
Development .sip files with definitions of PyQt classes. They Development .sip files with definitions of PyQt classes. They
are needed to build PyQt, but also as building blocks of other are needed to build PyQt, but also as building blocks of other
packages based on them, like PyKDE. packages based on them, like PyTDE.
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)

@ -1,11 +1,8 @@
# Always build under "/usr" # Always build under "/usr"
%define tde_prefix /usr
%define cmake_modules_dir %{_datadir}/cmake/Modules %define cmake_modules_dir %{_datadir}/cmake/Modules
%define tde_version 14.0.0 %define tde_version 14.0.0
%define tde_prefix /usr
# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
# Later compiled Trinity products should be aware of that !
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}

Loading…
Cancel
Save