Author: helio
Date: Tue Feb 13 14:21:51 2007
New Revision: 120391
Modified:
packages/cooker/qt3/current/SPECS/qt3.spec
Log:
- Moved qt doc dir for qt3, instead of qt-%%version. Since we can have
officially one qt3 installed a
time on Mandriva system, there's no need of versionated directories. This
solves the issue of
having multiple empty dirs from old upgrade. Similar approach need to be done
on qt4 package.
Modified: packages/cooker/qt3/current/SPECS/qt3.spec
==============================================================================
--- packages/cooker/qt3/current/SPECS/qt3.spec (original)
+++ packages/cooker/qt3/current/SPECS/qt3.spec Tue Feb 13 14:21:51 2007
@@ -2,7 +2,7 @@
# not (sublibdirs are correctly qualified in the latter case however).
%define qtdir %{_prefix}/lib/qt3
%define libqt3name %mklibname qt 3
-%define qtrelease %mkrel 4
+%define qtrelease %mkrel 5
%define libqassistantname %mklibname qassistantclient 1
%define libdesignercore %mklibname designercore 1
@@ -591,7 +591,8 @@
%files example
%defattr(-,root,root)
-%doc %_docdir/qt-%version/examples
+%dir %_docdir/%name/examples
+%doc %_docdir/%name/examples/*
#--------------------------------------------------------------------
@@ -604,7 +605,8 @@
%files tutorial
%defattr(-,root,root)
-%doc %_docdir/qt-%version/tutorial
+%dir %_docdir/%name/tutorial
+%doc %_docdir/%name/tutorial/*
#--------------------------------------------------------------------
@@ -616,14 +618,18 @@
%description doc
This package contain Qt documentation
+%post doc
+# Remove old qt3 doc directories
+find %_docdir -maxdepth 1 -type d -name qt-3.\* -exec rm -rf {} \;
+
%files doc
-%dir %_docdir/qt-%version/
-%doc %_docdir/qt-%version/FAQ
-%doc %_docdir/qt-%version/LICENSE*
-%doc %_docdir/qt-%version/README*
-%dir %_docdir/qt-%version/doc/
-%dir %_docdir/qt-%version/doc/html/
-%doc %_docdir/qt-%version/doc/html/*
+%dir %_docdir/%name
+%doc %_docdir/%name/FAQ
+%doc %_docdir/%name/LICENSE*
+%doc %_docdir/%name/README*
+%dir %_docdir/%name/doc/
+%dir %_docdir/%name/doc/html/
+%doc %_docdir/%name/doc/html/*
%dir %qtdir/doc/
%qtdir/doc/html
@@ -714,7 +720,7 @@
-libdir %qtdir/%_lib \
-plugindir %qtdir/plugins/%_lib \
-sysconfdir %_sysconfdir \
- -docdir %_docdir/qt-%version/doc/ \
+ -docdir %_docdir/%name/doc/ \
%if %{buildDebug}
-debug \
%else
@@ -801,69 +807,69 @@
cd -
rm -rf %buildroot/%qtdir/bin/qmake
-install -m 0755 $RPM_BUILD_DIR/%nameqt-%version/qmake/qmake
%buildroot/%qtdir/bin/
+install -m 0755 %_builddir/%nameqt-%version/qmake/qmake %buildroot/%qtdir/bin/
# David - 3.0.0-0.11mdk - Install a README for Mandriva Linux
-install -m 0644 %SOURCE8 %buildroot/%_docdir/qt-%version/README.Mandriva_Linux
-perl -pi -e "s|QtVersion|%version|"
%buildroot/%_docdir/qt-%version/README.Mandriva_Linux
-perl -pi -e "s|PackageVersion|%version-%release|"
%buildroot/%_docdir/qt-%version/README.Mandriva_Linux
+install -m 0644 %SOURCE8 %buildroot/%_docdir/%name/README.Mandriva_Linux
+perl -pi -e "s|QtVersion|%version|"
%buildroot/%_docdir/%name/README.Mandriva_Linux
+perl -pi -e "s|PackageVersion|%version-%release|"
%buildroot/%_docdir/%name/README.Mandriva_Linux
# David - 3.0.0-0.11mdk - Install missing documentation
-install -d -m 0755 %buildroot/%_docdir/qt-%version/
-install -m 0644 $RPM_BUILD_DIR/%nameqt-%version/FAQ
%buildroot/%_docdir/qt-%version/
-install -m 0644 $RPM_BUILD_DIR/%nameqt-%version/LICENSE*
%buildroot/%_docdir/qt-%version/
-install -m 0644 $RPM_BUILD_DIR/%nameqt-%version/README
%buildroot/%_docdir/qt-%version/
-install -m 0644 $RPM_BUILD_DIR/%nameqt-%version/README-QT.TXT
%buildroot/%_docdir/qt-%version/
+install -d -m 0755 %buildroot/%_docdir/%name/
+install -m 0644 %_builddir/%nameqt-%version/FAQ
%buildroot/%_docdir/%name/
+install -m 0644 %_builddir/%nameqt-%version/LICENSE*
%buildroot/%_docdir/%name/
+install -m 0644 %_builddir/%nameqt-%version/README
%buildroot/%_docdir/%name/
+install -m 0644 %_builddir/%nameqt-%version/README-QT.TXT
%buildroot/%_docdir/%name/
# David - 3.0.0-0.11mdk - Install man pages
install -d -m 0755 %buildroot/%_mandir/man1/
-for i in $RPM_BUILD_DIR/%nameqt-%version/doc/man/man1/* ; do
+for i in %_builddir/%nameqt-%version/doc/man/man1/* ; do
if [ ! -d $i ] ; then
install -m 0644 $i %buildroot/%_mandir/man1/
fi
done
#
install -d -m 0755 %buildroot/%_mandir/man3/
-for i in $RPM_BUILD_DIR/%nameqt-%version/doc/man/man3/* ; do
+for i in %_builddir/%nameqt-%version/doc/man/man3/* ; do
if [ ! -d $i ] ; then
install -m 0644 $i %buildroot/%_mandir/man3/
fi
done
install -d -m 0755 %buildroot/%_bindir/
-install -m 0755 $RPM_BUILD_DIR/%nameqt-%version/bin/moc
%buildroot/%qtdir/bin/moc
+install -m 0755 %_builddir/%nameqt-%version/bin/moc %buildroot/%qtdir/bin/moc
# David - 3.0.1-2mdk - Install .pri files needed to build examples and
tutorials
install -d -m 0755 %buildroot/%qtdir/src/
-for i in $RPM_BUILD_DIR/%nameqt-%version/src/*.pri; do
+for i in %_builddir/%nameqt-%version/src/*.pri; do
install -m 0644 $i %buildroot/%qtdir/src/
done
-cp -ar $RPM_BUILD_DIR/%nameqt-%version/examples/
%buildroot/%_docdir/qt-%version
-cp -ar $RPM_BUILD_DIR/%nameqt-%version/tutorial/
%buildroot/%_docdir/qt-%version
+cp -ar %_builddir/%nameqt-%version/examples/ %buildroot/%_docdir/%name
+cp -ar %_builddir/%nameqt-%version/tutorial/ %buildroot/%_docdir/%name
# Fix include directory for examples ( based on David Faure changes )
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e "s|../../../include|%qtdir/include|"
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e "s|../../include|%qtdir/include|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|../../../include|%qtdir/include|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|../../include|%qtdir/include|"
# Fix lib directory for examples
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e "s|../../../../lib/libqt-mt.prl|%qtdir/%_lib/libqt-mt.prl|"
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e "s|../../../lib/libqt-mt.prl|%qtdir/%_lib/libqt-mt.prl|"
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e "s|../../lib/libqt-mt.prl|%qtdir/%_lib/libqt-mt.prl|"
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e
"s|../../src/qt_professional.pri|%qtdir/src/qt_professional.pri|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|../../../../lib/libqt-mt.prl|%qtdir/%_lib/libqt-mt.prl|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|../../../lib/libqt-mt.prl|%qtdir/%_lib/libqt-mt.prl|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|../../lib/libqt-mt.prl|%qtdir/%_lib/libqt-mt.prl|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|../../src/qt_professional.pri|%qtdir/src/qt_professional.pri|"
# Set RPM_BUILD_DIR to QTDIR
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e "s|$RPM_BUILD_DIR/qt-%version|%qtdir|"
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e
"s|$RPM_BUILD_DIR/qt-x11-free-%version/mkspecs/|%qtdir/mkspecs/|"
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e "s|$RPM_BUILD_DIR/qt-x11-free-%version/|%qtdir/|"
-find %buildroot/%_docdir/qt-%version/{examples,tutorial} -name Makefile |
xargs perl -pi -e
"s|../../lib/libqassistantclient.prl|%qtdir/%_lib/libqassistantclient.prl|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|%_builddir/qt-%version|%qtdir|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|%_builddir/qt-x11-free-%version/mkspecs/|%qtdir/mkspecs/|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e "s|%_builddir/qt-x11-free-%version/|%qtdir/|"
+find %buildroot/%_docdir/%name/{examples,tutorial} -name Makefile | xargs perl
-pi -e
"s|../../lib/libqassistantclient.prl|%qtdir/%_lib/libqassistantclient.prl|"
# Remove .obj .moc directories
-for name in `find %buildroot/%_docdir/qt-%version/{examples,tutorial} -type d
-name .obj`; do
+for name in `find %buildroot/%_docdir/%name/{examples,tutorial} -type d -name
.obj`; do
rm -rf $name
done
-for name in `find %buildroot/%_docdir/qt-%version/{examples,tutorial} -type d
-name .moc`; do
+for name in `find %buildroot/%_docdir/%name/{examples,tutorial} -type d -name
.moc`; do
rm -rf $name
done
@@ -881,7 +887,7 @@
# and want all its directories in its own directory...)
cd %buildroot/%qtdir/
install -d -m 0755 doc
-ln -s %_datadir/doc/qt-%version/doc/html/ doc/html
+ln -s %_docdir/%name/doc/html/ doc/html
cd -
# David - 3.0.0-0.11mdk - Install needed files to automatically set QTDIR
