François Andriot
10 years ago
parent
fa814aeacb
commit
b4aa46185c
@ -1,19 +0,0 @@
|
||||
*** tqtinterface/qtinterface/Makefile.am.ORI 2011-09-16 20:05:43.000000000 +0200
|
||||
--- tqtinterface/qtinterface/Makefile.am 2011-09-16 20:05:54.000000000 +0200
|
||||
***************
|
||||
*** 150,156 ****
|
||||
endif
|
||||
|
||||
install-exec-local:
|
||||
! test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
|
||||
cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/"
|
||||
cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/"
|
||||
cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/"
|
||||
--- 150,156 ----
|
||||
endif
|
||||
|
||||
install-exec-local:
|
||||
! test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
|
||||
cp -Rp "$(srcdir)/tqt-replace" "$(DESTDIR)$(bindir)/"
|
||||
cp -Rp "$(srcdir)/tqt-replace-stream" "$(DESTDIR)$(bindir)/"
|
||||
cp -Rp "$(srcdir)/moc-tqt" "$(DESTDIR)$(bindir)/"
|
||||
@ -1,139 +0,0 @@
|
||||
# Default version for this component
|
||||
%if "%{?version}" == ""
|
||||
%define version 3.5.12
|
||||
%endif
|
||||
%define release 9
|
||||
|
||||
# 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
|
||||
%endif
|
||||
|
||||
# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
|
||||
# whereas newer versions use "qt3", "qt3-devel" ...
|
||||
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
|
||||
%define _qt_suffix 3
|
||||
%endif
|
||||
|
||||
|
||||
# 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 _includedir %{_prefix}/include/tqt
|
||||
|
||||
# TDE 3.5.12 specific building variables
|
||||
BuildRequires: autoconf automake libtool m4
|
||||
BuildRequires: qt%{?_qt_suffix}-devel >= 3.3.8b
|
||||
Requires: qt%{?_qt_suffix} >= 3.3.8b
|
||||
|
||||
|
||||
Name: tqtinterface
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}%{?_variant}
|
||||
License: GPL
|
||||
Summary: Trinity QT Interface
|
||||
Group: System Environment/Libraries
|
||||
|
||||
Vendor: Trinity Project
|
||||
URL: http://www.trinitydesktop.org/
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
|
||||
Prefix: %{_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
Patch0: tqtinterface-3.5.12-qtinterface-makefile.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libXi-devel
|
||||
BuildRequires: pth-devel
|
||||
|
||||
|
||||
%description
|
||||
Trinity QT Interface
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: %{name} - Development files
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Development files for %{name}
|
||||
|
||||
%prep
|
||||
%setup -q -n dependencies/%{name}
|
||||
%patch0 -p1
|
||||
|
||||
%__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 || : ; . /etc/profile.d/qt.sh
|
||||
CFLAGS=$( pkg-config --libs qt-mt )
|
||||
%configure \
|
||||
--enable-new-ldflags \
|
||||
--disable-dependency-tracking \
|
||||
--disable-debug --disable-warnings --enable-final
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%__rm -rf %{?buildroot}
|
||||
%__mkdir_p %{?buildroot}%{_includedir}
|
||||
%__make install DESTDIR=%{?buildroot}
|
||||
|
||||
# RHEL 5: add newline at end of include files
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 5
|
||||
for i in %{?buildroot}%{_includedir}/*.h; do
|
||||
echo "" >>${i}
|
||||
done
|
||||
%endif
|
||||
|
||||
%clean
|
||||
%__rm -rf %{?buildroot}
|
||||
|
||||
%files
|
||||
%{_bindir}/*
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/*.la
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Sep 16 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-9
|
||||
- Add support for RHEL 5.
|
||||
|
||||
* Mon Sep 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-8
|
||||
- Add "Group"
|
||||
|
||||
* Sun Sep 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-7
|
||||
- Import to GIT
|
||||
- Removes cmake stuff, build with autotools only
|
||||
|
||||
* Thu Aug 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
|
||||
- Use '/etc/profile.d/qt.sh' to source QT environment
|
||||
|
||||
* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
|
||||
- Add missing BuildRequires
|
||||
|
||||
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
|
||||
- Correct macro to install under "/opt", if desired
|
||||
|
||||
* Wed Dec 22 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
|
||||
- Re-add '.la' files, needed for kdelibs compilation
|
||||
|
||||
* Sat Dec 18 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
|
||||
- Add cmake support
|
||||
- Removes '.la' files
|
||||
|
||||
* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
|
||||
- Add macro _trinity_prefix to define custom installation prefix (ex: /opt/trinity)
|
||||
- Move TQT includes into 'tqt' subdirectory to avoid conflict with 'qt-devel' package (from KDE4)
|
||||
|
||||
* Tue Dec 07 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
|
||||
- Initial version
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--- tqtinterface/qtinterface/tqt.h.cmake.orig 2011-10-09 02:40:38.000000000 -0400
|
||||
+++ tqtinterface/qtinterface/tqt.h.cmake 2012-05-01 15:10:09.220681454 -0400
|
||||
@@ -74,6 +74,11 @@
|
||||
#define TQS_OK QS_OK
|
||||
#define TQTSFUNC QTSFUNC
|
||||
#define TQ_TYPENAME Q_TYPENAME
|
||||
+
|
||||
+#define TQ_BYTE_ORDER Q_BYTE_ORDER
|
||||
+#define TQ_LITTLE_ENDIAN Q_LITTLE_ENDIAN
|
||||
+#define TQ_BIG_ENDIAN Q_BIG_ENDIAN
|
||||
+
|
||||
#define TQT_CHECK_INVALID_MAP_ELEMENT QT_CHECK_INVALID_MAP_ELEMENT
|
||||
|
||||
#define TQT_VERSION QT_VERSION
|
||||
@ -1,150 +0,0 @@
|
||||
# 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
|
||||
%define cmake_modules_dir %{tde_prefix}/share/cmake
|
||||
%else
|
||||
%define cmake_modules_dir %{_datadir}/cmake/Modules
|
||||
%endif
|
||||
|
||||
# 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_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
|
||||
Name: trinity-tqtinterface
|
||||
Version: 3.5.13.1
|
||||
Release: 1%{?dist}%{?_variant}
|
||||
License: GPL
|
||||
Summary: Trinity QT Interface
|
||||
Group: System Environment/Libraries
|
||||
|
||||
Vendor: Trinity Project
|
||||
URL: http://www.trinitydesktop.org/
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Source0: tqtinterface-3.5.13.1.tar.gz
|
||||
|
||||
# [tqtinterface] Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
|
||||
Patch1: tqtinterface-3.5.13-add_missing_endianness_defines.patch
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
BuildRequires: cmake >= 2.8
|
||||
BuildRequires: qt3-devel
|
||||
Requires: qt3
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
%if 0%{?rhel} == 4
|
||||
BuildRequires: xorg-x11-devel
|
||||
%else
|
||||
BuildRequires: pth-devel
|
||||
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||
BuildRequires: %{_lib}xi-devel
|
||||
%else
|
||||
BuildRequires: libXi-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Obsoletes: tqtinterface < %{version}-%{release}
|
||||
Provides: tqtinterface = %{version}-%{release}
|
||||
|
||||
|
||||
%description
|
||||
Trinity QT Interface
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: %{name} - Development files
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: qt3-devel
|
||||
|
||||
Obsoletes: tqtinterface-devel < %{version}-%{release}
|
||||
Provides: tqtinterface-devel = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Development files for %{name}
|
||||
|
||||
%if 0%{?suse_version} || 0%{?pclinuxos}
|
||||
%debug_package
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n tqtinterface-3.5.13.1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt3.sh
|
||||
|
||||
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
|
||||
%__mkdir_p build
|
||||
cd build
|
||||
%endif
|
||||
|
||||
# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
|
||||
# another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
|
||||
# Otherwise, it defaults to ${QTDIR}/lib !
|
||||
%cmake \
|
||||
-DQT_PREFIX_DIR=${QTDIR} \
|
||||
-DQT_VERSION=3 \
|
||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
|
||||
-DLIB_INSTALL_DIR=%{tde_libdir} \
|
||||
-DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
|
||||
-DBIN_INSTALL_DIR=%{tde_bindir} \
|
||||
-DQT_LIBRARY_DIR=${QTLIB:-${QTDIR}/%{_lib}} \
|
||||
..
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%__rm -rf %{?buildroot}
|
||||
%__mkdir_p %{?buildroot}%{_includedir}
|
||||
%__make install DESTDIR=%{?buildroot} -C build
|
||||
|
||||
# RHEL 5: add newline at end of include files to avoid warnings
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 5
|
||||
for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
|
||||
echo "" >>${i}
|
||||
done
|
||||
%endif
|
||||
|
||||
# Install 'cmake' modules for development use
|
||||
%__mkdir_p %{?buildroot}%{cmake_modules_dir}
|
||||
for i in cmake/modules/*.cmake; do
|
||||
%__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
|
||||
done
|
||||
|
||||
%clean
|
||||
%__rm -rf %{?buildroot}
|
||||
|
||||
%post
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%post devel
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%postun devel
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%files
|
||||
%{tde_bindir}/*
|
||||
%{tde_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%{tde_includedir}/tqt
|
||||
%{tde_libdir}/*.so
|
||||
%{tde_libdir}/*.la
|
||||
%{tde_libdir}/pkgconfig/*.pc
|
||||
%{cmake_modules_dir}/*.cmake
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
|
||||
- Switch to v3.5.13-sru branch
|
||||
@ -1,161 +0,0 @@
|
||||
# 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
|
||||
%define cmake_modules_dir %{tde_prefix}/share/cmake
|
||||
%else
|
||||
%define cmake_modules_dir %{_datadir}/cmake/Modules
|
||||
%endif
|
||||
|
||||
# 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_includedir %{tde_prefix}/include
|
||||
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||
|
||||
Name: trinity-tqtinterface
|
||||
Version: 3.5.13
|
||||
Release: 3%{?dist}%{?_variant}
|
||||
License: GPL
|
||||
Summary: Trinity QT Interface
|
||||
Group: System Environment/Libraries
|
||||
|
||||
Vendor: Trinity Project
|
||||
URL: http://www.trinitydesktop.org/
|
||||
Packager: Francois Andriot <francois.andriot@free.fr>
|
||||
|
||||
Prefix: %{tde_prefix}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Source0: tqtinterface-3.5.13.tar.gz
|
||||
|
||||
# [tqtinterface] Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
|
||||
Patch1: tqtinterface-3.5.13-add_missing_endianness_defines.patch
|
||||
|
||||
# TDE 3.5.13 specific building variables
|
||||
BuildRequires: cmake >= 2.8
|
||||
BuildRequires: qt3-devel
|
||||
Requires: qt3
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
%if 0%{?rhel} == 4
|
||||
BuildRequires: xorg-x11-devel
|
||||
%else
|
||||
BuildRequires: pth-devel
|
||||
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||
BuildRequires: %{_lib}xi-devel
|
||||
%else
|
||||
BuildRequires: libXi-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Obsoletes: tqtinterface < %{version}-%{release}
|
||||
Provides: tqtinterface = %{version}-%{release}
|
||||
|
||||
|
||||
%description
|
||||
Trinity QT Interface
|
||||
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
Summary: %{name} - Development files
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: qt3-devel
|
||||
|
||||
Obsoletes: tqtinterface-devel < %{version}-%{release}
|
||||
Provides: tqtinterface-devel = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Development files for %{name}
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%debug_package
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n dependencies/tqtinterface
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
unset QTDIR; . /etc/profile.d/qt?.sh
|
||||
|
||||
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
|
||||
%__mkdir_p build
|
||||
cd build
|
||||
%endif
|
||||
|
||||
# Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
|
||||
# another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
|
||||
# Otherwise, it defaults to ${QTDIR}/lib !
|
||||
%cmake \
|
||||
-DQT_PREFIX_DIR=${QTDIR} \
|
||||
-DQT_VERSION=3 \
|
||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
|
||||
-DLIB_INSTALL_DIR=%{tde_libdir} \
|
||||
-DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
|
||||
-DBIN_INSTALL_DIR=%{tde_bindir} \
|
||||
-DQT_LIBRARY_DIR=${QTLIB:-${QTDIR}/%{_lib}} \
|
||||
..
|
||||
|
||||
%__make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%__rm -rf %{?buildroot}
|
||||
%__mkdir_p %{?buildroot}%{_includedir}
|
||||
%__make install DESTDIR=%{?buildroot} -C build
|
||||
|
||||
# RHEL 5: add newline at end of include files to avoid warnings
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 5
|
||||
for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
|
||||
echo "" >>${i}
|
||||
done
|
||||
%endif
|
||||
|
||||
# Install 'cmake' modules for development use
|
||||
%__mkdir_p %{?buildroot}%{cmake_modules_dir}
|
||||
for i in cmake/modules/*.cmake; do
|
||||
%__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
|
||||
done
|
||||
|
||||
%clean
|
||||
%__rm -rf %{?buildroot}
|
||||
|
||||
%post
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%post devel
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%postun devel
|
||||
/sbin/ldconfig || :
|
||||
|
||||
%files
|
||||
%{tde_bindir}/*
|
||||
%{tde_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%{tde_includedir}/tqt
|
||||
%{tde_libdir}/*.so
|
||||
%{tde_libdir}/*.la
|
||||
%{tde_libdir}/pkgconfig/*.pc
|
||||
%{cmake_modules_dir}/*.cmake
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
|
||||
- Rebuilt for Fedora 17
|
||||
- Add missing endian-ness defines [Bug #727] [Commit #458e74a6]
|
||||
|
||||
* 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
|
||||
|
||||
* Sun Aug 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
|
||||
- Import to GIT
|
||||
- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)
|
||||
Loading…
Reference in new issue