From fe0db1142848776b89a32c25b4f23db22f5987df Mon Sep 17 00:00:00 2001 From: Robert Xu Date: Sun, 14 Aug 2011 09:48:56 -0400 Subject: variety of little fixes (and major libtqt4 build testing) --- opensuse/libtqt4/libtqt4.spec | 113 ++++++++++++------------ opensuse/libtqt4/tqtinterface-3.5.12.99.tar.bz2 | Bin 0 -> 768340 bytes 2 files changed, 56 insertions(+), 57 deletions(-) create mode 100644 opensuse/libtqt4/tqtinterface-3.5.12.99.tar.bz2 (limited to 'opensuse/libtqt4') diff --git a/opensuse/libtqt4/libtqt4.spec b/opensuse/libtqt4/libtqt4.spec index f01d2621c..54a9c6256 100644 --- a/opensuse/libtqt4/libtqt4.spec +++ b/opensuse/libtqt4/libtqt4.spec @@ -16,21 +16,21 @@ # # norootforbuild -  -Name:           libtqt4 -License:        GPLv2+ -Group:          Graphical Desktop/TDE -Summary:        Interface and abstraction library for Qt and Trinity -Version:        3.5.12.99 -Release:        1%{dist} -Source0:        %{name}-%{version}.tar.bz2 -URL:        http://www.trinitydesktop.org/ -  -BuildRoot:      %{_tmppath}/%{name}-%{version}-build + +Name: libtqt4 +License: GPLv2+ +Group: Graphical Desktop/TDE +Summary: Interface and abstraction library for Qt and Trinity +Version: 3.5.12.99 +Release: 1 +Source0: tqtinterface-%{version}.tar.bz2 +URL: http://www.trinitydesktop.org/ + +BuildRoot: %{_tmppath}/%{name}-%{version}-build %define with_qt3 1 %define with_qt4 0 -  + %if %{with_qt3} BuildRequires: qt3-devel >= 3.3.8c Requires: qt3 >= 3.3.8c @@ -45,25 +45,25 @@ BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: libtool BuildRequires: gcc-c++ -  + %description This package includes libraries that abstract the underlying Qt system from the actual Trinity code, allowing easy, complete upgrades to new versions of Qt. -  + It also contains various functions that have been removed from newer versions of Qt, but are completely portable and isolated from other APIs such as Xorg. This allows the Trinity project to efficiently perform certain operations that are infeasible or unneccessarily difficult when using pure Qt4 or above. -  + Authors: -------- Timothy Pearson     Robert Xu     Tim Williams     Serghei Amelian -  + %package devel Summary: TQtinterface header files Group: Graphical Desktop/TDE @@ -77,16 +77,16 @@ Requires: libqt4-devel >= 4.7.0 %description devel This package contains Trinity KDE specific window options and commands. You need this package to compile Trinity modules. (TQT headers) -  -  + + Authors: -------- Timothy Pearson     Robert Xu     Tim Williams     Serghei Amelian -  -  + + %package tools Summary: TQtinterface library files Group: Graphical Desktop/TDE @@ -94,21 +94,17 @@ Requires: libtqt4 %description tools This package contains Trinity KDE specific window options and commands. It includes tools to help you modify and use TQtinterface. -  + Authors: -------- Timothy Pearson     Robert Xu     Tim Williams     Serghei Amelian -  -  + + %prep -%if %{with_qt3} -%setup -qn tqtinterface-qt3-%{version} -%else -%setup -qn tqtinterface-qt4-%{version} -%endif +%setup -qn tqtinterface-%{version} %build CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; @@ -117,53 +113,56 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; mkdir build cd build cmake \ -        -DCMAKE_VERBOSE_MAKEFILE=ON \ -        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ -        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ -        -DLIB_INSTALL_DIR:PATH=%{_libdir} \ -        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ -        -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ %if "%{?_lib}" == "lib64" -        -DLIB_SUFFIX=64 \ + -DLIB_SUFFIX=64 \ %endif -        -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ %if %{with_qt3} -     -DWITH_QT3=ON \ + -DQT_VERSION=3 \ %endif %if %{with_qt4} -     -DWITH_QT4=ON \ + -DQT_VERSION=4 \ %endif -     -DQT_LIBRARY_DIRS=/usr/lib/qt3/%{_lib} \ -     -DQT_INCLUDE_DIRS=/usr/lib/qt3/include \ -     -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ -     ../ -  + -DQT_LIBRARY_DIRS=/usr/lib/qt3/%{_lib} \ + -DQT_INCLUDE_DIRS=/usr/lib/qt3/include \ + -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ + ../ + make %{?_smp_mflags} VERBOSE=1 -  + %install -  +cd build make DESTDIR=%{buildroot} install -  +rm -rf %{buildroot}/%{_libdir}/*.la + +# What is this? Leftovers?! +rm -rf %{buildroot}/%{_libdir}/debug + %clean rm -rf $RPM_BUILD_ROOT -  + %post -p /sbin/ldconfig -  + %postun -p /sbin/ldconfig -  + %files %defattr(-,root,root,755) -%{_libdir}/libtqt.so -%{_libdir}/libtqt.so.4 -%{_libdir}/libtqt.so.4.2.0 -  +%{_libdir}/libtqt.so* +%{_libdir}/libtqassistantclient.so* + %files devel %defattr(-,root,root,755) %dir %{_includedir}/Qt %{_includedir}/Qt/q*.h %{_includedir}/tq*.h -%{_libdir}/pkgconfig/TQt.pc +%{_libdir}/pkgconfig/tqt.pc %files tools %defattr(-,root,root,755) @@ -178,6 +177,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/tmoc %{_bindir}/tqt-replace %{_bindir}/tqt-replace-stream -  -%changelog +%{_bindir}/uic-tqt +%changelog diff --git a/opensuse/libtqt4/tqtinterface-3.5.12.99.tar.bz2 b/opensuse/libtqt4/tqtinterface-3.5.12.99.tar.bz2 new file mode 100644 index 000000000..d74475745 Binary files /dev/null and b/opensuse/libtqt4/tqtinterface-3.5.12.99.tar.bz2 differ -- cgit v1.2.1