![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-11-22 16:35:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt4 (Old)
and /work/SRC/openSUSE:Factory/.libqt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "DMueller@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-10-19 08:46:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-11-22 16:35:32.000000000 +0100
@@ -1,0 +2,9 @@
+Fri Nov 16 18:53:12 UTC 2012 - cgiboudeaux@gmx.com
+
+- Fix the SLE_11 build. %patch -R doesn't work for the SLE repos.
+- Spec cleanup: Remove obsolete conditions and drop use-freetype-default-legacy.diff,
+ Replace absolute paths with rpm variables,
+ Move the prep section below the packages descriptions,
+ Remove some unused blocks
+
+-------------------------------------------------------------------
libqt4-sql-plugins.changes: same change
libqt4.changes: same change
Old:
----
use-freetype-default-legacy.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.3zuNnD/_old 2012-11-22 16:35:41.000000000 +0100
+++ /var/tmp/diff_new_pack.3zuNnD/_new 2012-11-22 16:35:41.000000000 +0100
@@ -21,34 +21,32 @@
BuildRequires: Mesa-devel
BuildRequires: alsa-devel
BuildRequires: cups-devel
+BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: sqlite3-devel
-%if 0%{?suse_version} > 1020
-BuildRequires: fdupes
-%endif
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
+Summary: Qt documentation
+License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
+Group: Documentation/HTML
+Url: http://www.trolltech.com
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
-Version: 4.8.3
-Release: 0
%define base_name libqt4
%define tar_version everywhere-opensource-src-%{version}
+Version: 4.8.3
+Release: 0
# COMMON-VERSION-END
# COMMON-VERSION-END
-BuildRequires: libQtWebKit-devel >= %version
-BuildRequires: libqt4-devel >= %version
-Url: http://www.trolltech.com
-Summary: Qt documentation
-License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
-Group: Documentation/HTML
-Requires: libqt4 = %version
-Requires: libqt4-devel-doc-data = %version
-Requires: libqt4-sql-sqlite >= %version
+BuildRequires: libQtWebKit-devel >= %{version}
+BuildRequires: libqt4-devel >= %{version}
+Requires: libqt4 = %{version}
+Requires: libqt4-devel-doc-data = %{version}
+Requires: libqt4-sql-sqlite >= %{version}
Provides: libqt4-examples = 4.4.0
Obsoletes: libqt4-examples < 4.4.0
Provides: qt-devel-doc = 4.4.0
@@ -68,10 +66,10 @@
Source15: designer.png
Source16: linguist.png
Source17: qt_lt.ts
+
Patch2: qt-never-strip.diff
Patch3: plastik-default.diff
Patch6: use-freetype-default.diff
-Patch1006: use-freetype-default-legacy.diff
Patch8: link-tools-shared.diff
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
@@ -101,11 +99,11 @@
Patch140: fix_assistant_segfault_QTBUG-25324.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
- %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
+ %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
%define check_config \
grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \
- if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \
- diff -u /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \
+ if test -f %{_datadir}/qt4/mkspecs/qconfig.pri ; then \
+ diff -u %{_datadir}/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \
fi \
%description
@@ -113,19 +111,35 @@
This package contains base tools, like string, xml, and network
handling.
+# COMMON-END
+# COMMON-DESC-BEGIN
+%package -n qt4-x11-tools
+Summary: C++ Program Library, Core Components
+Group: System/Libraries
+Requires: libqt4-x11 >= %{version}
+%description -n qt4-x11-tools
+Qt is a set of libraries for developing applications.
+
+This package contains base tools, like string, xml, and network
+handling.
+%package data
+Summary: C++ Program Library, Core Components
+Group: System/Libraries
+Requires: %{name} = %{version}
+BuildArch: noarch
+%description data
+The architecture independent data files for the documentation.
+# COMMON-DESC-END
+# COMMON-PREP-BEGIN
%prep
-%define plugindir %_libdir/qt4/plugins
+%define plugindir %{_libdir}/qt4/plugins
%setup -q -n qt-%tar_version
%patch2
%patch3
-%if %suse_version > 1010
%patch6
-%else
-%patch1006
-%endif
# needs rediffing
#%patch8
%patch39
@@ -133,16 +147,16 @@
%patch43
%patch60
# bnc#374073 comment #8
-# %patch61
+#%patch61
%patch70
%patch75
%patch87
%patch101
# ### 48 rediff
-# %patch107
+#%patch107
%patch109
# ### 48 rediff
-# %patch113
+#%patch113
%patch118 -p1
%ifarch hppa
%patch119
@@ -155,48 +169,26 @@
%patch132
%patch136
%patch137
-%patch138 -Rp1
+%patch138 -p1
%patch139 -p1
%patch140 -p1
# ### 47 rediff
#%patch121 -p1
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}
-# COMMON-END
-# COMMON-END
-
-%package -n qt4-x11-tools
-Summary: C++ Program Library, Core Components
-Group: System/Libraries
-Requires: libqt4-x11 >= %version
-
-%description -n qt4-x11-tools
-Qt is a set of libraries for developing applications.
-
-This package contains base tools, like string, xml, and network
-handling.
-
-%package data
-%if %suse_version > 1110
-BuildArch: noarch
-%endif
-Summary: C++ Program Library, Core Components
-Group: System/Libraries
-Requires: %name = %version
-
-%description data
-The architecture independent data files for the documentation.
+# COMMON-PREP-END
+# COMMON-PREP-END
%build
%ifarch ppc64
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
export QTDIR=$PWD
export PATH=$PWD/bin:$PATH
export LD_LIBRARY_PATH=$PWD/lib/
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
export MAKEFLAGS="%{?_smp_mflags}"
%ifarch sparc64
platform="-platform linux-g++-64"
@@ -206,9 +198,8 @@
echo yes | ./configure %common_options $platform \
-webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql
%check_config
-%if 0
-make %{?_smp_mflags} sub-src
-%else # simply use the binaries from the -devel package instead of building it again
+
+# Simply use the binaries from the -devel package instead of building it again
rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \
( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done )
rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \
@@ -217,7 +208,7 @@
( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done )
rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \
( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done )
-%endif
+
make %{?_smp_mflags} -C tools/assistant
make %{?_smp_mflags} -C demos
make %{?_smp_mflags} -C examples
@@ -225,96 +216,90 @@
%install
export QTDIR=$PWD
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C tools/assistant install
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C examples install
-mv $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer $RPM_BUILD_ROOT/%_bindir
-mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser $RPM_BUILD_ROOT/%_bindir/qt4-browser
-ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer
-ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser
+make INSTALL_ROOT=%{buildroot} -C tools/assistant install
+make INSTALL_ROOT=%{buildroot} -C demos install
+make INSTALL_ROOT=%{buildroot} -C examples install
+mv %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer %{buildroot}/%{_bindir}
+mv %{buildroot}/%{_libdir}/qt4/demos/browser/browser %{buildroot}/%{_bindir}/qt4-browser
+ln -s %{_bindir}/svgviewer %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer
+ln -s %{_bindir}/qt4-browser %{buildroot}/%{_libdir}/qt4/demos/browser/browser
# htmldocs are not generated - why?
for d in docimages qchdocs htmldocs ; do
- make INSTALL_ROOT=$RPM_BUILD_ROOT install_${d}
+ make INSTALL_ROOT=%{buildroot} install_${d}
done
# remove some executable flags from image files:
-find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x
-find $RPM_BUILD_ROOT/usr/share -name "*.css" -print0 | xargs -0 chmod a-x
-find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_datadir} -name "*.png" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_datadir} -name "*.css" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_datadir} -name "*.js" -print0 | xargs -0 chmod a-x
+
# remove executable flags from source files:
-find %{buildroot}/usr/%_lib/qt4/examples -name "*.h" -print0 | xargs -0 chmod a-x
-find %{buildroot}/usr/%_lib/qt4/examples -name "*.cpp" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_libdir}/qt4/examples -name "*.h" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_libdir}/qt4/examples -name "*.cpp" -print0 | xargs -0 chmod a-x
# reduce fileconflicts
for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do
- test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f
+ test -f %{buildroot}/$f && rm %{buildroot}/$f
done
-find $RPM_BUILD_ROOT -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty
+
+find %{buildroot} -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty
# argggh, qmake is such a piece of <censored>
-mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+find %{buildroot}/%{_libdir} -type f -name '*.pc' -exec mv {} %{buildroot}/%{_libdir}/pkgconfig \;
+
# fix more qmake errors
-mkdir -p $RPM_BUILD_ROOT/%_libdir/qt
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/
-ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos
-ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples
-
-rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}*
-rm -f $RPM_BUILD_ROOT/%_libdir/libQtXml.*
-rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins
-%if %suse_version > 1020
-%fdupes $RPM_BUILD_ROOT/usr/include
-%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/
-%fdupes $RPM_BUILD_ROOT%_docdir/%base_name
-%endif
+mkdir -p %{buildroot}/%{_libdir}/qt
+find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+find %{buildroot}/%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+mkdir -p %{buildroot}/%_docdir/%base_name/
+ln -s %{_libdir}/qt4/demos %{buildroot}/%_docdir/%base_name/demos
+ln -s %{_libdir}/qt4/examples %{buildroot}/%_docdir/%base_name/examples
+
+rm -f %{buildroot}/%{_libdir}/libQt{3,A,C,G,H,N,S,T}*
+rm -f %{buildroot}/%{_libdir}/libQtXml.*
+rm -rf %{buildroot}/%{_libdir}/qt4/plugins
+
+%fdupes %{buildroot}%{_prefix}/include
+%fdupes %{buildroot}%{_libdir}/qt4/
+%fdupes %{buildroot}%_docdir/%base_name
# remove some executable flags from source files:
-chmod ugo-x %{buildroot}/usr/%_lib/qt4/examples/tutorials/modelview/*/*.h
-chmod ugo-x %{buildroot}/usr/%_lib/qt4/examples/tutorials/modelview/*/*.cpp
+chmod ugo-x %{buildroot}%{_libdir}/qt4/examples/tutorials/modelview/*/*.h
+chmod ugo-x %{buildroot}%{_libdir}/qt4/examples/tutorials/modelview/*/*.cpp
%suse_update_desktop_file -i assistant4 Qt Development Documentation
%pre
# used to be a directory, is now a binary
-if [ $1 -gt 1 -a -d %_libdir/qt4/examples/declarative/i18n/i18n ]; then
- rm -rf %_libdir/qt4/examples/declarative/i18n/i18n || true
+if [ $1 -gt 1 -a -d %{_libdir}/qt4/examples/declarative/i18n/i18n ]; then
+ rm -rf %{_libdir}/qt4/examples/declarative/i18n/i18n || true
fi
-%clean
-rm -rf $RPM_BUILD_ROOT
-# no baselibs supplements for older distros
-%if %suse_version < 1110
- sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf
-%endif
-
%files
%defattr(-,root,root,755)
-/usr/bin/assistant
-/usr/bin/qcollectiongenerator
-/usr/bin/qtdemo
-/usr/share/applications/assistant4.desktop
-/usr/share/pixmaps/assistant.png
-#/usr/share/qt4/translations/assistant_*.qm
-/usr/%_lib/qt4/demos
-%dir %_docdir/%base_name
-%_docdir/%base_name/demos
-%_docdir/%base_name/examples
-%_libdir/qt4/examples
+%dir %{_docdir}/%base_name
+%{_bindir}/assistant
+%{_bindir}/qcollectiongenerator
+%{_bindir}/qtdemo
+%{_datadir}/applications/assistant4.desktop
+%{_datadir}/pixmaps/assistant.png
+%{_docdir}/%base_name/demos
+%{_docdir}/%base_name/examples
+%{_libdir}/qt4/demos
+%{_libdir}/qt4/examples
%files -n qt4-x11-tools
%defattr(-,root,root,755)
-/usr/bin/svgviewer
-/usr/bin/qt4-browser
+%{_bindir}/qt4-browser
+%{_bindir}/svgviewer
%files data
%defattr(-,root,root,755)
-%dir /usr/share/doc/packages/%base_name
-/usr/share/doc/packages/%base_name/qch
-/usr/share/doc/packages/%base_name/html*
-/usr/share/doc/packages/%base_name/src
+%dir %{_datadir}/doc/packages/%base_name
+%{_datadir}/doc/packages/%base_name/qch
+%{_datadir}/doc/packages/%base_name/html*
+%{_datadir}/doc/packages/%base_name/src
%changelog
++++++ libqt4-sql-plugins.spec ++++++
--- /var/tmp/diff_new_pack.3zuNnD/_old 2012-11-22 16:35:41.000000000 +0100
+++ /var/tmp/diff_new_pack.3zuNnD/_new 2012-11-22 16:35:41.000000000 +0100
@@ -29,19 +29,19 @@
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
+Summary: Qt 4 SQL related libraries
+License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
+Group: System/Libraries
+Url: http://www.trolltech.com
# COMMON-VERSION-BEGIN
# COMMON-VERSION-BEGIN
-Version: 4.8.3
-Release: 0
%define base_name libqt4
%define tar_version everywhere-opensource-src-%{version}
+Version: 4.8.3
+Release: 0
# COMMON-VERSION-END
# COMMON-VERSION-END
-BuildRequires: libqt4-devel >= %version
-Url: http://www.trolltech.com
-Summary: Qt 4 SQL related libraries
-License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
-Group: System/Libraries
+BuildRequires: libqt4-devel >= %{version}
# COMMON-BEGIN
# COMMON-BEGIN
Source: qt-%{tar_version}.tar.gz
@@ -57,10 +57,10 @@
Source15: designer.png
Source16: linguist.png
Source17: qt_lt.ts
+
Patch2: qt-never-strip.diff
Patch3: plastik-default.diff
Patch6: use-freetype-default.diff
-Patch1006: use-freetype-default-legacy.diff
Patch8: link-tools-shared.diff
Patch39: 0191-listview-alternate-row-colors.diff
Patch40: 0188-fix-moc-parser-same-name-header.diff
@@ -90,11 +90,11 @@
Patch140: fix_assistant_segfault_QTBUG-25324.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
- %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
+ %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir %_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir %{_libdir}/qt4/demos -plugindir %plugindir -translationdir %{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir %{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
%define check_config \
grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \
- if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \
- diff -u /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \
+ if test -f %{_datadir}/qt4/mkspecs/qconfig.pri ; then \
+ diff -u %{_datadir}/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \
fi \
%description
@@ -102,19 +102,49 @@
This package contains base tools, like string, xml, and network
handling.
+# COMMON-END
+# COMMON-DESC-BEGIN
+%package -n libqt4-sql-unixODBC
+Summary: Qt 4 unixODBC plugin
+Group: Development/Libraries/C and C++
+Requires: libqt4-sql = %{version}
+Provides: libqt4_sql_backend = %{version}
+Obsoletes: qt-sql-unixODBC < 4.6.0
+Provides: qt-sql-unixODBC = 4.6.0
+%description -n libqt4-sql-unixODBC
+Qt unixODBC plugin to support databases via unixODBC within Qt
+applications.
+
+%package -n libqt4-sql-postgresql
+Summary: Qt 4 PostgreSQL plugin
+Group: Development/Libraries/C and C++
+Requires: libqt4-sql = %{version}
+Provides: libqt4_sql_backend = %{version}
+Obsoletes: qt-sql-postgresql < 4.6.0
+Provides: qt-sql-postgresql = 4.6.0
+
+%description -n libqt4-sql-postgresql
+Qt SQL plugin to support PostgreSQL servers in Qt applications.
+%package -n libqt4-sql-mysql
+Summary: Qt 4 MySQL support
+Group: Development/Libraries/C and C++
+Requires: libqt4-sql = %{version}
+Provides: libqt4_sql_backend = %{version}
+Obsoletes: qt-sql-mysql < 4.6.0
+Provides: qt-sql-mysql = 4.6.0
+%description -n libqt4-sql-mysql
+A plugin to support MySQL server in Qt applications.
+# COMMON-DESC-END
+# COMMON-PREP-BEGIN
%prep
-%define plugindir %_libdir/qt4/plugins
+%define plugindir %{_libdir}/qt4/plugins
%setup -q -n qt-%tar_version
%patch2
%patch3
-%if %suse_version > 1010
%patch6
-%else
-%patch1006
-%endif
# needs rediffing
#%patch8
%patch39
@@ -122,16 +152,16 @@
%patch43
%patch60
# bnc#374073 comment #8
-# %patch61
+#%patch61
%patch70
%patch75
%patch87
%patch101
# ### 48 rediff
-# %patch107
+#%patch107
%patch109
# ### 48 rediff
-# %patch113
+#%patch113
%patch118 -p1
%ifarch hppa
%patch119
@@ -144,59 +174,25 @@
%patch132
%patch136
%patch137
-%patch138 -Rp1
+%patch138 -p1
%patch139 -p1
%patch140 -p1
# ### 47 rediff
#%patch121 -p1
# be sure not to use them
rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff,fonts}
-# COMMON-END
-# COMMON-END
-
-%package -n libqt4-sql-unixODBC
-Summary: Qt 4 unixODBC plugin
-Group: Development/Libraries/C and C++
-Requires: libqt4-sql = %version
-Provides: libqt4_sql_backend = %version
-Obsoletes: qt-sql-unixODBC < 4.6.0
-Provides: qt-sql-unixODBC = 4.6.0
-
-%description -n libqt4-sql-unixODBC
-Qt unixODBC plugin to support databases via unixODBC within Qt
-applications.
-
-%package -n libqt4-sql-postgresql
-Summary: Qt 4 PostgreSQL plugin
-Group: Development/Libraries/C and C++
-Requires: libqt4-sql = %version
-Provides: libqt4_sql_backend = %version
-Obsoletes: qt-sql-postgresql < 4.6.0
-Provides: qt-sql-postgresql = 4.6.0
-
-%description -n libqt4-sql-postgresql
-Qt SQL plugin to support PostgreSQL servers in Qt applications.
-
-%package -n libqt4-sql-mysql
-Summary: Qt 4 MySQL support
-Group: Development/Libraries/C and C++
-Requires: libqt4-sql = %version
-Provides: libqt4_sql_backend = %version
-Obsoletes: qt-sql-mysql < 4.6.0
-Provides: qt-sql-mysql = 4.6.0
-
-%description -n libqt4-sql-mysql
-A plugin to support MySQL server in Qt applications.
+# COMMON-PREP-END
+# COMMON-PREP-END
%build
export QTDIR=$PWD
export PATH=$PWD/bin:$PATH
export LD_LIBRARY_PATH=$PWD/lib/
%ifarch ppc64
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
export MAKEFLAGS="%{?_smp_mflags}"
%ifarch sparc64
platform="-platform linux-g++-64"
@@ -208,71 +204,55 @@
-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \
-plugin-sql-odbc \
-plugin-sql-mysql -I/usr/include/mysql/ -no-sql-sqlite -no-sql-sqlite2
-%if 0
-make %{?_smp_mflags} sub-src
-%else
+
rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \
( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done )
rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \
( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done )
make %{?_smp_mflags} -C src/sql
make %{?_smp_mflags} -C src/plugins/sqldrivers
-%endif
%install
export QTDIR=$PWD
-%if 0
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C src install_subtargets
-%else
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/sql install
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/plugins/sqldrivers install
-%endif
+make INSTALL_ROOT=%{buildroot} -C src/sql install
+make INSTALL_ROOT=%{buildroot} -C src/plugins/sqldrivers install
+
# argggh, qmake is such a piece of <censored>
-mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+find %{buildroot}/%{_libdir} -type f -name '*.pc' -exec mv {} %{buildroot}/%{_libdir}/pkgconfig \;
# fix more qmake errors
-mkdir -p $RPM_BUILD_ROOT/%_libdir/qt
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-rm -rf $RPM_BUILD_ROOT/usr/include
-rm -rf $RPM_BUILD_ROOT/usr/%_lib/pkgconfig
-mkdir $RPM_BUILD_ROOT/%_libdir/backup
-mv $RPM_BUILD_ROOT/%_libdir/libQtSql*.so.* $RPM_BUILD_ROOT/%_libdir/backup
-rm -f $RPM_BUILD_ROOT/%_libdir/lib*
-mv $RPM_BUILD_ROOT/%_libdir/backup/libQtSql*.so.* $RPM_BUILD_ROOT/%_libdir
-rmdir $RPM_BUILD_ROOT/%_libdir/backup
-rm -rf $RPM_BUILD_ROOT/usr/bin
-for i in $RPM_BUILD_ROOT/%plugindir/*; do
+mkdir -p %{buildroot}/%{_libdir}/qt
+find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+find %{buildroot}/%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+rm -rf %{buildroot}%{_prefix}/include
+rm -rf %{buildroot}%{_libdir}/pkgconfig
+mkdir %{buildroot}/%{_libdir}/backup
+mv %{buildroot}/%{_libdir}/libQtSql*.so.* %{buildroot}/%{_libdir}/backup
+rm -f %{buildroot}/%{_libdir}/lib*
+mv %{buildroot}/%{_libdir}/backup/libQtSql*.so.* %{buildroot}/%{_libdir}
+rmdir %{buildroot}/%{_libdir}/backup
+rm -rf %{buildroot}%{_prefix}/bin
+for i in %{buildroot}/%plugindir/*; do
case "$i" in
*sqldriv*): ;;
*) rm -rf $i
esac
done
-rm -f $RPM_BUILD_ROOT/%_libdir/libQtSql*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-# no baselibs supplements for older distros
-%if %suse_version < 1110
- sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf
-%endif
+rm -f %{buildroot}/%{_libdir}/libQtSql*
%files -n libqt4-sql-unixODBC
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
-
%plugindir/sqldrivers/libqsqlodbc*.so
%files -n libqt4-sql-postgresql
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
-
%plugindir/sqldrivers/libqsqlpsql*.so
%files -n libqt4-sql-mysql
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
-
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog
++++++ libqt4.spec ++++++
++++ 949 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/libqt4/libqt4.spec
++++ and /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.spec
++++++ libqt4-devel-doc.spec.in ++++++
--- /var/tmp/diff_new_pack.3zuNnD/_old 2012-11-22 16:35:41.000000000 +0100
+++ /var/tmp/diff_new_pack.3zuNnD/_new 2012-11-22 16:35:41.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt4-devel-doc
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,33 +16,30 @@
#
# nodebuginfo
-
Name: libqt4-devel-doc
BuildRequires: Mesa-devel
BuildRequires: alsa-devel
BuildRequires: cups-devel
+BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: sqlite3-devel
-%if 0%{?suse_version} > 1020
-BuildRequires: fdupes
-%endif
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
-# COMMON-VERSION-BEGIN
-# COMMON-VERSION-END
-BuildRequires: libQtWebKit-devel >= %version
-BuildRequires: libqt4-devel >= %version
-Url: http://www.trolltech.com
-Summary: Qt documentation
License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
+Summary: Qt documentation
+Url: http://www.trolltech.com
Group: Documentation/HTML
-Requires: libqt4 = %version
-Requires: libqt4-devel-doc-data = %version
-Requires: libqt4-sql-sqlite >= %version
+# COMMON-VERSION-BEGIN
+# COMMON-VERSION-END
+BuildRequires: libQtWebKit-devel >= %{version}
+BuildRequires: libqt4-devel >= %{version}
+Requires: libqt4 = %{version}
+Requires: libqt4-devel-doc-data = %{version}
+Requires: libqt4-sql-sqlite >= %{version}
Provides: libqt4-examples = 4.4.0
Obsoletes: libqt4-examples < 4.4.0
Provides: qt-devel-doc = 4.4.0
@@ -50,10 +47,11 @@
# COMMON-BEGIN
# COMMON-END
+# COMMON-DESC-BEGIN
%package -n qt4-x11-tools
Summary: C++ Program Library, Core Components
Group: System/Libraries
-Requires: libqt4-x11 >= %version
+Requires: libqt4-x11 >= %{version}
%description -n qt4-x11-tools
Qt is a set of libraries for developing applications.
@@ -62,26 +60,28 @@
handling.
%package data
-%if %suse_version > 1110
-BuildArch: noarch
-%endif
Summary: C++ Program Library, Core Components
Group: System/Libraries
-Requires: %name = %version
+Requires: %{name} = %{version}
+BuildArch: noarch
%description data
The architecture independent data files for the documentation.
+# COMMON-DESC-END
+
+# COMMON-PREP-BEGIN
+# COMMON-PREP-END
%build
%ifarch ppc64
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
export QTDIR=$PWD
export PATH=$PWD/bin:$PATH
export LD_LIBRARY_PATH=$PWD/lib/
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
export MAKEFLAGS="%{?_smp_mflags}"
%ifarch sparc64
platform="-platform linux-g++-64"
@@ -91,9 +91,8 @@
echo yes | ./configure %common_options $platform \
-webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql
%check_config
-%if 0
-make %{?_smp_mflags} sub-src
-%else # simply use the binaries from the -devel package instead of building it again
+
+# Simply use the binaries from the -devel package instead of building it again
rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \
( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done )
rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \
@@ -102,7 +101,7 @@
( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done )
rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \
( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done )
-%endif
+
make %{?_smp_mflags} -C tools/assistant
make %{?_smp_mflags} -C demos
make %{?_smp_mflags} -C examples
@@ -110,96 +109,90 @@
%install
export QTDIR=$PWD
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C tools/assistant install
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C demos install
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C examples install
-mv $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer $RPM_BUILD_ROOT/%_bindir
-mv $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser $RPM_BUILD_ROOT/%_bindir/qt4-browser
-ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer
-ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser
+make INSTALL_ROOT=%{buildroot} -C tools/assistant install
+make INSTALL_ROOT=%{buildroot} -C demos install
+make INSTALL_ROOT=%{buildroot} -C examples install
+mv %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer %{buildroot}/%{_bindir}
+mv %{buildroot}/%{_libdir}/qt4/demos/browser/browser %{buildroot}/%{_bindir}/qt4-browser
+ln -s %{_bindir}/svgviewer %{buildroot}/%{_libdir}/qt4/examples/painting/svgviewer/svgviewer
+ln -s %{_bindir}/qt4-browser %{buildroot}/%{_libdir}/qt4/demos/browser/browser
# htmldocs are not generated - why?
for d in docimages qchdocs htmldocs ; do
- make INSTALL_ROOT=$RPM_BUILD_ROOT install_${d}
+ make INSTALL_ROOT=%{buildroot} install_${d}
done
# remove some executable flags from image files:
-find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x
-find $RPM_BUILD_ROOT/usr/share -name "*.css" -print0 | xargs -0 chmod a-x
-find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_datadir} -name "*.png" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_datadir} -name "*.css" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_datadir} -name "*.js" -print0 | xargs -0 chmod a-x
+
# remove executable flags from source files:
-find %{buildroot}/usr/%_lib/qt4/examples -name "*.h" -print0 | xargs -0 chmod a-x
-find %{buildroot}/usr/%_lib/qt4/examples -name "*.cpp" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_libdir}/qt4/examples -name "*.h" -print0 | xargs -0 chmod a-x
+find %{buildroot}%{_libdir}/qt4/examples -name "*.cpp" -print0 | xargs -0 chmod a-x
# reduce fileconflicts
for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do
- test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f
+ test -f %{buildroot}/$f && rm %{buildroot}/$f
done
-find $RPM_BUILD_ROOT -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty
+
+find %{buildroot} -type d -print0 | xargs -0 --no-run-if-empty rmdir --ignore-fail-on-non-empty
# argggh, qmake is such a piece of <censored>
-mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+find %{buildroot}/%{_libdir} -type f -name '*.pc' -exec mv {} %{buildroot}/%{_libdir}/pkgconfig \;
+
# fix more qmake errors
-mkdir -p $RPM_BUILD_ROOT/%_libdir/qt
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name/
-ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos
-ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples
-
-rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}*
-rm -f $RPM_BUILD_ROOT/%_libdir/libQtXml.*
-rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins
-%if %suse_version > 1020
-%fdupes $RPM_BUILD_ROOT/usr/include
-%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/
-%fdupes $RPM_BUILD_ROOT%_docdir/%base_name
-%endif
+mkdir -p %{buildroot}/%{_libdir}/qt
+find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+find %{buildroot}/%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+mkdir -p %{buildroot}/%_docdir/%base_name/
+ln -s %{_libdir}/qt4/demos %{buildroot}/%_docdir/%base_name/demos
+ln -s %{_libdir}/qt4/examples %{buildroot}/%_docdir/%base_name/examples
+
+rm -f %{buildroot}/%{_libdir}/libQt{3,A,C,G,H,N,S,T}*
+rm -f %{buildroot}/%{_libdir}/libQtXml.*
+rm -rf %{buildroot}/%{_libdir}/qt4/plugins
+
+%fdupes %{buildroot}%{_prefix}/include
+%fdupes %{buildroot}%{_libdir}/qt4/
+%fdupes %{buildroot}%_docdir/%base_name
# remove some executable flags from source files:
-chmod ugo-x %{buildroot}/usr/%_lib/qt4/examples/tutorials/modelview/*/*.h
-chmod ugo-x %{buildroot}/usr/%_lib/qt4/examples/tutorials/modelview/*/*.cpp
+chmod ugo-x %{buildroot}%{_libdir}/qt4/examples/tutorials/modelview/*/*.h
+chmod ugo-x %{buildroot}%{_libdir}/qt4/examples/tutorials/modelview/*/*.cpp
%suse_update_desktop_file -i assistant4 Qt Development Documentation
%pre
# used to be a directory, is now a binary
-if [ $1 -gt 1 -a -d %_libdir/qt4/examples/declarative/i18n/i18n ]; then
- rm -rf %_libdir/qt4/examples/declarative/i18n/i18n || true
+if [ $1 -gt 1 -a -d %{_libdir}/qt4/examples/declarative/i18n/i18n ]; then
+ rm -rf %{_libdir}/qt4/examples/declarative/i18n/i18n || true
fi
-%clean
-rm -rf $RPM_BUILD_ROOT
-# no baselibs supplements for older distros
-%if %suse_version < 1110
- sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf
-%endif
-
%files
%defattr(-,root,root,755)
-/usr/bin/assistant
-/usr/bin/qcollectiongenerator
-/usr/bin/qtdemo
-/usr/share/applications/assistant4.desktop
-/usr/share/pixmaps/assistant.png
-#/usr/share/qt4/translations/assistant_*.qm
-/usr/%_lib/qt4/demos
-%dir %_docdir/%base_name
-%_docdir/%base_name/demos
-%_docdir/%base_name/examples
-%_libdir/qt4/examples
+%dir %{_docdir}/%base_name
+%{_bindir}/assistant
+%{_bindir}/qcollectiongenerator
+%{_bindir}/qtdemo
+%{_datadir}/applications/assistant4.desktop
+%{_datadir}/pixmaps/assistant.png
+%{_docdir}/%base_name/demos
+%{_docdir}/%base_name/examples
+%{_libdir}/qt4/demos
+%{_libdir}/qt4/examples
%files -n qt4-x11-tools
%defattr(-,root,root,755)
-/usr/bin/svgviewer
-/usr/bin/qt4-browser
+%{_bindir}/qt4-browser
+%{_bindir}/svgviewer
%files data
%defattr(-,root,root,755)
-%dir /usr/share/doc/packages/%base_name
-/usr/share/doc/packages/%base_name/qch
-/usr/share/doc/packages/%base_name/html*
-/usr/share/doc/packages/%base_name/src
+%dir %{_datadir}/doc/packages/%base_name
+%{_datadir}/doc/packages/%base_name/qch
+%{_datadir}/doc/packages/%base_name/html*
+%{_datadir}/doc/packages/%base_name/src
%changelog
++++++ libqt4-sql-plugins.spec.in ++++++
--- /var/tmp/diff_new_pack.3zuNnD/_old 2012-11-22 16:35:41.000000000 +0100
+++ /var/tmp/diff_new_pack.3zuNnD/_new 2012-11-22 16:35:41.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt4-sql-plugins
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
#
# nodebuginfo
-
Name: libqt4-sql-plugins
BuildRequires: Mesa-devel
BuildRequires: alsa-devel
@@ -29,21 +28,22 @@
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
-# COMMON-VERSION-BEGIN
-# COMMON-VERSION-END
-BuildRequires: libqt4-devel >= %version
-Url: http://www.trolltech.com
-Summary: Qt 4 SQL related libraries
License: SUSE-LGPL-2.1-with-nokia-exception-1.1 or GPL-3.0
+Summary: Qt 4 SQL related libraries
+Url: http://www.trolltech.com
Group: System/Libraries
+# COMMON-VERSION-BEGIN
+# COMMON-VERSION-END
+BuildRequires: libqt4-devel >= %{version}
# COMMON-BEGIN
# COMMON-END
+# COMMON-DESC-BEGIN
%package -n libqt4-sql-unixODBC
Summary: Qt 4 unixODBC plugin
Group: Development/Libraries/C and C++
-Requires: libqt4-sql = %version
-Provides: libqt4_sql_backend = %version
+Requires: libqt4-sql = %{version}
+Provides: libqt4_sql_backend = %{version}
Obsoletes: qt-sql-unixODBC < 4.6.0
Provides: qt-sql-unixODBC = 4.6.0
@@ -54,8 +54,8 @@
%package -n libqt4-sql-postgresql
Summary: Qt 4 PostgreSQL plugin
Group: Development/Libraries/C and C++
-Requires: libqt4-sql = %version
-Provides: libqt4_sql_backend = %version
+Requires: libqt4-sql = %{version}
+Provides: libqt4_sql_backend = %{version}
Obsoletes: qt-sql-postgresql < 4.6.0
Provides: qt-sql-postgresql = 4.6.0
@@ -65,23 +65,27 @@
%package -n libqt4-sql-mysql
Summary: Qt 4 MySQL support
Group: Development/Libraries/C and C++
-Requires: libqt4-sql = %version
-Provides: libqt4_sql_backend = %version
+Requires: libqt4-sql = %{version}
+Provides: libqt4_sql_backend = %{version}
Obsoletes: qt-sql-mysql < 4.6.0
Provides: qt-sql-mysql = 4.6.0
%description -n libqt4-sql-mysql
A plugin to support MySQL server in Qt applications.
+# COMMON-DESC-END
+
+# COMMON-PREP-BEGIN
+# COMMON-PREP-END
%build
export QTDIR=$PWD
export PATH=$PWD/bin:$PATH
export LD_LIBRARY_PATH=$PWD/lib/
%ifarch ppc64
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
export MAKEFLAGS="%{?_smp_mflags}"
%ifarch sparc64
platform="-platform linux-g++-64"
@@ -93,71 +97,55 @@
-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \
-plugin-sql-odbc \
-plugin-sql-mysql -I/usr/include/mysql/ -no-sql-sqlite -no-sql-sqlite2
-%if 0
-make %{?_smp_mflags} sub-src
-%else
+
rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \
( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done )
rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \
( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done )
make %{?_smp_mflags} -C src/sql
make %{?_smp_mflags} -C src/plugins/sqldrivers
-%endif
%install
export QTDIR=$PWD
-%if 0
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C src install_subtargets
-%else
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/sql install
-make INSTALL_ROOT=$RPM_BUILD_ROOT -C src/plugins/sqldrivers install
-%endif
+make INSTALL_ROOT=%{buildroot} -C src/sql install
+make INSTALL_ROOT=%{buildroot} -C src/plugins/sqldrivers install
+
# argggh, qmake is such a piece of <censored>
-mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*.pc' -exec mv {} $RPM_BUILD_ROOT/%_libdir/pkgconfig \;
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+find %{buildroot}/%{_libdir} -type f -name '*.pc' -exec mv {} %{buildroot}/%{_libdir}/pkgconfig \;
# fix more qmake errors
-mkdir -p $RPM_BUILD_ROOT/%_libdir/qt
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-rm -rf $RPM_BUILD_ROOT/usr/include
-rm -rf $RPM_BUILD_ROOT/usr/%_lib/pkgconfig
-mkdir $RPM_BUILD_ROOT/%_libdir/backup
-mv $RPM_BUILD_ROOT/%_libdir/libQtSql*.so.* $RPM_BUILD_ROOT/%_libdir/backup
-rm -f $RPM_BUILD_ROOT/%_libdir/lib*
-mv $RPM_BUILD_ROOT/%_libdir/backup/libQtSql*.so.* $RPM_BUILD_ROOT/%_libdir
-rmdir $RPM_BUILD_ROOT/%_libdir/backup
-rm -rf $RPM_BUILD_ROOT/usr/bin
-for i in $RPM_BUILD_ROOT/%plugindir/*; do
+mkdir -p %{buildroot}/%{_libdir}/qt
+find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+find %{buildroot}/%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+rm -rf %{buildroot}%{_prefix}/include
+rm -rf %{buildroot}%{_libdir}/pkgconfig
+mkdir %{buildroot}/%{_libdir}/backup
+mv %{buildroot}/%{_libdir}/libQtSql*.so.* %{buildroot}/%{_libdir}/backup
+rm -f %{buildroot}/%{_libdir}/lib*
+mv %{buildroot}/%{_libdir}/backup/libQtSql*.so.* %{buildroot}/%{_libdir}
+rmdir %{buildroot}/%{_libdir}/backup
+rm -rf %{buildroot}%{_prefix}/bin
+for i in %{buildroot}/%plugindir/*; do
case "$i" in
*sqldriv*): ;;
*) rm -rf $i
esac
done
-rm -f $RPM_BUILD_ROOT/%_libdir/libQtSql*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-# no baselibs supplements for older distros
-%if %suse_version < 1110
- sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf
-%endif
+rm -f %{buildroot}/%{_libdir}/libQtSql*
%files -n libqt4-sql-unixODBC
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
-
%plugindir/sqldrivers/libqsqlodbc*.so
%files -n libqt4-sql-postgresql
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
-
%plugindir/sqldrivers/libqsqlpsql*.so
%files -n libqt4-sql-mysql
%defattr(-,root,root,755)
%dir %plugindir/sqldrivers
-
%plugindir/sqldrivers/libqsqlmysql*.so
%changelog
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.3zuNnD/_old 2012-11-22 16:35:41.000000000 +0100
+++ /var/tmp/diff_new_pack.3zuNnD/_new 2012-11-22 16:35:41.000000000 +0100
@@ -9,7 +9,9 @@
sed -n -e '/COMMON-VERSION-BEGIN/,/COMMON-VERSION-END/p' libqt4.spec
sed -n -e '/COMMON-VERSION-END/,/COMMON-BEGIN/p' $spec.in
sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' libqt4.spec
- sed -n -e '/COMMON-END/,$p' $spec.in;
+ sed -n -e '/COMMON-DESC-BEGIN/,/COMMON-DESC-END/p' $spec.in
+ sed -n -e '/COMMON-PREP-BEGIN/,/COMMON-PREP-END/p' libqt4.spec
+ sed -n -e '/COMMON-PREP-END/,$p' $spec.in;
} > $spec.tmp && mv $spec.tmp $spec
done
++++++ undo-fix-jit-crash-on-x86_64.patch ++++++
--- /var/tmp/diff_new_pack.3zuNnD/_old 2012-11-22 16:35:41.000000000 +0100
+++ /var/tmp/diff_new_pack.3zuNnD/_new 2012-11-22 16:35:41.000000000 +0100
@@ -1,280 +1,256 @@
-Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)
- .
- Cherry-picked from webkit commit
- a5b3261a8c4386b4e14ce40a34c7fc933a5f7001
-Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e
-Author: Kent Hansen
participants (1)
-
root@hilbert.suse.de