RPM Packaging: update dependencies

pull/3/head
François Andriot 11 years ago
parent 5427075cae
commit 5b9c5354a7

@ -3,6 +3,8 @@
%define _variant .opt %define _variant .opt
%endif %endif
%define tde_version 14.0.0
%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}
@ -13,7 +15,7 @@
%define _docdir %{tde_datadir}/doc %define _docdir %{tde_datadir}/doc
Name: trinity-arts Name: trinity-arts
Version: 14.0.0 Version: %{tde_version}
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
@ -30,7 +32,7 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kcmartsrc-pulseaudio Source1: kcmartsrc-pulseaudio
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: audiofile-devel BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
@ -202,20 +204,26 @@ Requires: %{name} = %{version}-%{release}
cd build 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 \
\
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \ -DBIN_INSTALL_DIR="%{tde_bindir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \ -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}/arts" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \ -DLIB_INSTALL_DIR="%{tde_libdir}" \
-DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \ -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
\
-DWITH_ALSA=ON \ -DWITH_ALSA=ON \
-DWITH_AUDIOFILE=ON \ -DWITH_AUDIOFILE=ON \
-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}
-DCMAKE_SKIP_RPATH=OFF \
..
%__make %{?_smp_mflags} || %__make %__make %{?_smp_mflags} || %__make

@ -3,7 +3,9 @@
%define _variant .opt %define _variant .opt
%endif %endif
# TDE 3.5.13 specific building variables %define tde_version 14.0.0
# TDE specific building variables
%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_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
@ -12,7 +14,7 @@
Name: trinity-avahi-tqt Name: trinity-avahi-tqt
Version: 14.0.0 Version: %{tde_version}
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
@ -30,33 +32,33 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: gcc-c++ BuildRequires: gcc-c++
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 >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: libtool BuildRequires: libtool
# DBUS support # DBUS support
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: dbus-1-devel BuildRequires: dbus-1-devel
%else %endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: dbus-devel BuildRequires: dbus-devel
%endif %endif
# AVAHI support
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel BuildRequires: %{_lib}avahi-client-devel
%if 0%{?pclinuxos}
BuildRequires: libexpat-devel
%else
# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
BuildRequires: %{_lib}expat%{?mgaversion:1}-devel
%endif
Provides: %{_lib}avahi-qt3 Provides: %{_lib}avahi-qt3
%else %endif
%if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
BuildRequires: avahi-devel BuildRequires: avahi-devel
%if 0%{?suse_version} %endif
BuildRequires: libexpat-devel
%else # EXPAT support
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: expat-devel BuildRequires: expat-devel
%endif %endif
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libexpat-devel
%endif %endif
Requires: trinity-tqt3 >= 3.5.0 Requires: trinity-tqt3 >= 3.5.0
@ -94,10 +96,12 @@ Development files for %{name}
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
unset QTDIR QTINC QTLIB
./autogen.sh
%build %build
unset QTDIR unset QTDIR QTINC QTLIB
./autogen.sh
%configure \ %configure \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \
@ -106,12 +110,16 @@ unset QTDIR
--docdir=%{tde_docdir} \ --docdir=%{tde_docdir} \
--includedir=%{tde_includedir} \ --includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
\
--disable-static \
--disable-dependency-tracking \
\
--enable-compat-libdns_sd \ --enable-compat-libdns_sd \
--with-systemdsystemunitdir=/lib/systemd/system \ --with-systemdsystemunitdir=/lib/systemd/system
--disable-static
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
%install %install
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} %__make install DESTDIR=%{?buildroot}
@ -145,5 +153,5 @@ unset QTDIR
%{tde_libdir}/pkgconfig/avahi-tqt.pc %{tde_libdir}/pkgconfig/avahi-tqt.pc
%changelog %changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE R14, using 'tqt3' instead of 'qt3' - Initial release for TDE 14.0.0

@ -109,6 +109,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 \
\
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \ -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \
.. ..
@ -126,5 +133,5 @@ cd build
%changelog %changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0 - Initial release for TDE R14.0.0

@ -156,11 +156,14 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \ --datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \ --includedir=%{tde_tdeincludedir} \
--disable-rpath \ \
--disable-dependency-tracking \
--disable-debug \
--enable-new-ldflags \ --enable-new-ldflags \
--enable-final \
--enable-closure \ --enable-closure \
--disable-debug --disable-warnings \ --disable-rpath \
--enable-final --enable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags}

@ -78,7 +78,7 @@ Provides: libcaldav-devel = %{version}-%{release}
%build %build
# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}" export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
if [ -d /usr/evolution28 ]; then if [ -d /usr/evolution28 ]; then
@ -89,6 +89,8 @@ fi
--docdir=%{tde_docdir}/libcaldav \ --docdir=%{tde_docdir}/libcaldav \
--includedir=%{tde_includedir} \ --includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
\
--disable-dependency-tracking
%__make %{?_smp_mflags} %__make %{?_smp_mflags}
@ -98,6 +100,7 @@ fi
%__rm -f %{buildroot}%{tde_libdir}/*.a %__rm -f %{buildroot}%{tde_libdir}/*.a
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}

@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
# CURL support
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
%else %else
@ -76,20 +76,22 @@ Provides: libcarddav-devel = %{version}-%{release}
%build %build
# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5 # CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}" export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${RPM_OPT_FLAGS}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# RHEL4 stuff
if [ -d /usr/evolution28 ]; then if [ -d /usr/evolution28 ]; then
export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
fi fi
#autoreconf --force --install --symlink
%configure \ %configure \
--includedir=%{tde_includedir} \ --includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \ --libdir=%{tde_libdir} \
\
--disable-dependency-tracking
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
%install %install
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -97,6 +99,7 @@ fi
%__rm -f %{buildroot}%{tde_libdir}/libcarddav.a %__rm -f %{buildroot}%{tde_libdir}/libcarddav.a
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
@ -126,9 +129,12 @@ fi
%Changelog %Changelog
* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.3-4
- Renames to 'trinity-libcaldav' - Initial release for TDE R14.0.0
* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3
- Renames to 'trinity-libcarddav'
- Build on MGA2 - Build on MGA2
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.5-2debian2 .1 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2
- Initial release for RHEL 6, RHEL 5, and Fedora 15 - Initial release for RHEL 6, RHEL 5, and Fedora 15

@ -154,7 +154,7 @@ cp -rf ../pyuic3 ../pylupdate3 .
echo yes | python ../configure.py \ echo yes | python ../configure.py \
-c -n %{_includedir}/tqscintilla \ -c -n %{_includedir}/tqscintilla \
-q /usr/share/tqt3 \ -q %{_datadir}/tqt3 \
-y tqt-mt \ -y tqt-mt \
-o %{_libdir} -u -j 10 \ -o %{_libdir} -u -j 10 \
-d %{python_sitearch} \ -d %{python_sitearch} \
@ -178,5 +178,5 @@ echo yes | python ../configure.py \
%changelog %changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.18.1-1
- Initial release for TDE R14, using 'tqt3' instead of 'qt3' - Initial release for TDE R14.0.0

@ -95,7 +95,7 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
%build %build
unset QTDIR unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"

@ -174,5 +174,5 @@ done
%{tde_docdir}/HTML/en/%{name} %{tde_docdir}/HTML/en/%{name}
%changelog %changelog
* Tue Jul 02 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.1-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.7.1-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -534,7 +534,8 @@ echo yes | ./configure \
\ \
-lfontconfig \ -lfontconfig \
-inputmethod \ -inputmethod \
-glibmainloop -glibmainloop \
-debug
# Fix bad headers # Fix bad headers

@ -2,6 +2,8 @@
%define tde_prefix /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
# TQT include files may conflict with QT4 includes, so we move them to a subdirectory. # TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
# Later compiled Trinity products should be aware of that ! # Later compiled Trinity products should be aware of that !
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
@ -9,7 +11,7 @@
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-tqtinterface Name: trinity-tqtinterface
Version: 14.0.0 Version: %{tde_version}
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
License: GPL License: GPL
Summary: Trinity QT Interface Summary: Trinity QT Interface
@ -23,7 +25,6 @@ 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}-%{version}%{?preversion:~%{preversion}}.tar.gz
# 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
@ -122,7 +123,7 @@ Development files for %{name}
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%build %build
unset QTDIR unset QTDIR QTINC QTLIB
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build
@ -130,12 +131,13 @@ cd build
%endif %endif
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="-DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="-DNDEBUG" \ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DWITH_GCC_VISIBILITY=ON \ -DWITH_GCC_VISIBILITY=ON \
\
-DQTDIR="%{tde_datadir}/tqt3" \ -DQTDIR="%{tde_datadir}/tqt3" \
-DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \ -DQT_INCLUDE_DIRS="%{tde_includedir}/tqt3" \
-DQT_LIBRARY_DIRS="%{tde_libdir}" \ -DQT_LIBRARY_DIRS="%{tde_libdir}" \

Loading…
Cancel
Save