rpms/qt4/FC-5 assistant.desktop, 1.2, 1.3 designer.desktop, 1.1, 1.2 linguist.desktop, 1.1, 1.2 qt-x11-opensource-src-4.1.2-assistant4.patch, 1.1, 1.2 qt4.spec, 1.10, 1.11 qtconfig.desktop, 1.1, 1.2 qtdemo.desktop, 1.1, 1.2

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25349

Modified Files:
	assistant.desktop designer.desktop linguist.desktop 
	qt-x11-opensource-src-4.1.2-assistant4.patch qt4.spec 
	qtconfig.desktop qtdemo.desktop 
Log Message:
* Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-5
- make FHS-friendly (bug #196901)
- cleanup %_bindir symlinks, (consistently) use qt4 postfix



Index: assistant.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/assistant.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- assistant.desktop	28 Jun 2006 12:07:12 -0000	1.2
+++ assistant.desktop	5 Jul 2006 11:38:23 -0000	1.3
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Assistant 
 Comment=Shows Qt4 documentation and examples
-Exec=assistant4
+Exec=assistant-qt4
 Icon=assistant
 Terminal=false
 Encoding=UTF-8


Index: designer.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/designer.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- designer.desktop	24 May 2006 14:06:14 -0000	1.1
+++ designer.desktop	5 Jul 2006 11:38:23 -0000	1.2
@@ -2,7 +2,7 @@
 Name=Qt4 Designer
 GenericName=Interface Designer
 Comment=Design GUIs for Qt4 applications
-Exec=designer4
+Exec=designer-qt4
 Icon=designer
 MimeType=application/x-designer;
 Terminal=false


Index: linguist.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/linguist.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linguist.desktop	24 May 2006 14:06:14 -0000	1.1
+++ linguist.desktop	5 Jul 2006 11:38:23 -0000	1.2
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Linguist 
 Comment=Add translations to Qt4 applications
-Exec=linguist4
+Exec=linguist-qt4
 Icon=linguist
 MimeType=application/x-linguist;
 Terminal=false

qt-x11-opensource-src-4.1.2-assistant4.patch:

Index: qt-x11-opensource-src-4.1.2-assistant4.patch
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt-x11-opensource-src-4.1.2-assistant4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-x11-opensource-src-4.1.2-assistant4.patch	24 May 2006 14:06:14 -0000	1.1
+++ qt-x11-opensource-src-4.1.2-assistant4.patch	5 Jul 2006 11:38:23 -0000	1.2
@@ -5,7 +5,7 @@
  {
      if ( path.isEmpty() )
 -        assistantCommand = "assistant";
-+        assistantCommand = "assistant4";
++        assistantCommand = "assistant-qt4";
      else {
          QFileInfo fi( path );
          if ( fi.isDir() )


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt4.spec	29 Jun 2006 14:56:26 -0000	1.10
+++ qt4.spec	5 Jul 2006 11:38:23 -0000	1.11
@@ -5,7 +5,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -27,33 +27,45 @@
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
-%define mysql  -plugin-sql-mysql 
+%define mysql  -no-sql-mysql 
+%if "%{?fedora}" > "3"
+%define mysql  -plugin-sql-mysql
+%endif
+%if "%{?rhel}" > "3"
+%define mysql  -plugin-sql-mysql
+%endif
 %define odbc   -plugin-sql-odbc 
 %define psql   -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
 
-%define qt_dirname qt4
+%define qt_dirname %{name} 
 %define qtdir %{_libdir}/%{qt_dirname}
-%define qt_docdir %{_docdir}/%{name}-doc-%{version}
-# see bug #196901
-%define qt_headerdir %{qtdir}/include
-# see bug #196901, Be careful about ever changing this, some 3rd-party libs install here (like qt4-qsa)
-%define qt_libdir %{qtdir}/%{_lib}
-
-Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d
-Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d
+# See bug #196901
+%define qt_datadir %{_datadir}/%{qt_dirname}
+%define qt_docdir %{_docdir}/%{qt_dirname}
+%define qt_headerdir %{_includedir} 
+# Be careful about ever changing this, some 3rd-party libs install here (like qt4-qsa)
+#define qt_libdir %{qtdir}/%{_lib}
+%define qt_libdir %{_libdir}
+%define qt_sysconfdir %{_sysconfdir}
+%define qt_translationdir %{qt_datadir}/translations
+
+%if "%{qt_libdir}" != "%{_libdir}"
+# needed for runtime, as well as pre,post
+Prereq:  /etc/ld.so.conf.d
+%endif
 
+BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
-BuildRequires: libmng-devel
+BuildRequires: findutils
+BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel
 BuildRequires: libjpeg-devel
+BuildRequires: libmng-devel
 BuildRequires: libpng-devel
-BuildRequires: zlib-devel
 BuildRequires: libungif-devel
-BuildRequires: findutils
-BuildRequires: cups-devel
-BuildRequires: tar
 BuildRequires: freetype-devel
-BuildRequires: fontconfig-devel
+BuildRequires: zlib-devel
 
 %define x_deps libGL-devel libGLU-devel
 %if "%{?fedora}" > "4"
@@ -86,14 +98,12 @@
 Obsoletes: %{name}-config < %{version}-%{release}
 Provides:  %{name}-config = %{version}-%{release}
 
-
 %description 
 Qt is a software toolkit for developing applications.
 
 This package contains base tools, like string, xml, and network
 handling.
 
-
 %package devel
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
@@ -161,14 +171,13 @@
 %{summary}.
 
 %package x11
-Group:	System Environment/Libraries
 Summary: Qt GUI-related libraries
+Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 %description x11
 Qt libraries which are used for drawing widgets and OpenGL items.
 
 
-
 %prep
 %setup -q -n qt-x11-opensource-src-%{version}
 
@@ -199,35 +208,39 @@
 
 # build shared, threaded (default) libraries
 echo yes | ./configure -v \
-  -no-rpath \
   -prefix %{qtdir} \
+  -datadir %{qt_datadir} \
   -docdir %{qt_docdir} \
   -headerdir %{qt_headerdir} \
   -libdir %{qt_libdir} \
+  -sysconfdir %{qt_sysconfdir} \
+  -translationdir %{qt_translationdir} \
   -platform %{platform} \
   -release \
   -shared \
+  -cups \
+  -fontconfig \
   -no-exceptions \
+  -no-rpath \
   -largefile \
   -qt-gif \
-  -system-zlib \
-  -system-libpng \
-  -system-libjpeg \
-  %{?mysql}  %{?mysql_include} %{?mysql_ldflags} \
-  %{?psql}   \
-  %{?odbc}   \
-  %{?sqlite} \
-  -cups \
   -sm \
   -stl \
+  -system-libmng \
+  -system-libpng \
+  -system-libjpeg \
+  -system-zlib \
+  -tablet \
   -xcursor \
   -xinerama \
   -xshape \
   -xrandr \
   -xrender \
   -xkb \
-  -fontconfig \
-  -tablet
+  %{?mysql}  %{?mysql_include} %{?mysql_ldflags} \
+  %{?psql}   \
+  %{?odbc}   \
+  %{?sqlite} 
 
 make %{?_smp_mflags}
 
@@ -242,7 +255,6 @@
   --dir %{buildroot}%{_datadir}/applications \
   --vendor="%{name}" \
   --add-category="X-Fedora" \
-  --remove-key=MapNotify \
   %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
 
 ## pkg-config
@@ -267,33 +279,25 @@
 
 # -doc make symbolic link to qt_docdir
 rm -rf %{buildroot}%{qtdir}/doc
-ln -s  ../../share/doc/%{name}-doc-%{version} %{buildroot}%{qtdir}/doc
+ln -s  ../../share/doc/%{name} %{buildroot}%{qtdir}/doc
 
 # put LICENSE.* files in %%qtdir, some apps' configure scripts expect to find them here
 install -p -m644 LICENSE.* %{buildroot}%{qtdir}/
 
-# Make symlinks in %%_bindir
+## Make symlinks in %%_bindir
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{qtdir}/bin 
 for i in *; do
-case "$i" in
-  qt3to4|uic3|rcc)
-    LINK=$i
-    ;;
-  qtconfig)
-    LINK=qt4config
-    ;;
-  qtdemo)
-    LINK=qt4demo
-    ;;
-  *)
-    LINK=${i}4
-    ;;
-esac
-#  ln -s ../%{_lib}/%{qt_dirname}/bin/$i %{buildroot}%{_bindir}/${LINK}
-# or use qt4-wrapper.sh
-   [ "$i" != "$LINK" ] && ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
-   install -p -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
+  case "$i" in
+    qt3to4|uic3|rcc)
+      LINK=$i
+      ;;
+    *)
+      LINK=${i}-qt4
+      ln -s $i %{buildroot}%{qtdir}/bin/${LINK}	
+      ;;
+  esac
+  install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
 done
 popd
 
@@ -310,8 +314,10 @@
 # .la files, die, die, die.
 rm -f %{buildroot}%{qt_libdir}/lib*.la
 
+%if "%{qt_libdir}" != "%{_libdir}"
 mkdir -p %{buildroot}/etc/ld.so.conf.d
 echo "%{qt_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+%endif
 
 
 %clean
@@ -325,12 +331,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README* changes* OPENSOURCE-NOTICE.TXT
+%doc README* changes*
+%{!?beta:%doc OPENSOURCE-NOTICE.TXT}
 %{qtdir}/LICENSE.*
+%if "%{qt_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
+%dir %{qt_libdir}
+%endif
 %dir %{qtdir}
 %dir %{qtdir}/bin/
-%dir %{qt_libdir}
+%dir %{qt_datadir}
 %{qt_libdir}/libQtCore.so.*
 %{qt_libdir}/libQtNetwork.so.*
 %{qt_libdir}/libQtSql.so.*
@@ -338,7 +348,7 @@
 %{qt_libdir}/libQtXml.so.*
 %dir %{qtdir}/plugins/
 %dir %{qtdir}/plugins/sqldrivers/
-%{qtdir}/translations/
+%{qt_translationdir}/
 
 %files x11 
 %defattr(-,root,root,-)
@@ -359,7 +369,10 @@
 %{qtdir}/bin/lrelease*
 %{qtdir}/bin/lupdate*
 %{qtdir}/bin/moc*
+%if "%{version}" < "4.2.0"
 %{qtdir}/bin/qm2ts*
+%{_bindir}/qm2ts*
+%endif
 %{qtdir}/bin/qmake*
 %{qtdir}/bin/qt3to4
 %{qtdir}/bin/rcc*
@@ -367,23 +380,24 @@
 %{_bindir}/lrelease*
 %{_bindir}/lupdate*
 %{_bindir}/moc*
-%{_bindir}/qm2ts*
 %{_bindir}/qmake*
 %{_bindir}/qt3to4
 %{_bindir}/rcc*
 %{_bindir}/uic*
+%if "%{qt_headerdir}" != "%{_includedir}"
 %dir %{qt_headerdir}/
+%endif
 %{qt_headerdir}/*
-%{qtdir}/mkspecs/
+%{qt_datadir}/mkspecs/
+%{qt_datadir}/phrasebooks/
+%{qt_datadir}/q3porting.xml
 %{qt_libdir}/libQtDesigner.so.*
 %{qt_libdir}/libQtDesignerComponents.so.*
 %{qt_libdir}/libQt*.so
 # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
 %{qt_libdir}/libQt*.a
 %{qt_libdir}/libQt*.prl
-%{qtdir}/phrasebooks/
 %{_libdir}/pkgconfig/*.pc
-%{qtdir}/q3porting.xml
 # Qt designer
 %{_bindir}/designer*
 %{qtdir}/bin/designer*
@@ -437,6 +451,10 @@
 
 
 %changelog
+* Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-5
+- make FHS-friendly (bug #196901)
+- cleanup %%_bindir symlinks, (consistently) use qt4 postfix
+
 * Wed Jun 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-4
 - x11: split-out gui(x11) from non-gui bits (bug #196899)
 


Index: qtconfig.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qtconfig.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtconfig.desktop	24 May 2006 14:06:14 -0000	1.1
+++ qtconfig.desktop	5 Jul 2006 11:38:23 -0000	1.2
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
-Exec=qt4config
+Exec=qtconfig-qt4
 Terminal=false
 Encoding=UTF-8
 Type=Application


Index: qtdemo.desktop
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qtdemo.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qtdemo.desktop	24 May 2006 14:06:14 -0000	1.1
+++ qtdemo.desktop	5 Jul 2006 11:38:23 -0000	1.2
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Demo 
 Comment=Show Qt4 demos and programming examples
-Exec=qt4demo
+Exec=qtdemo-qt4
 Terminal=false
 Encoding=UTF-8
 Type=Application