Changeset 1079

Timestamp:

Sep 13, 2011, 4:24:09 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: Change package base name from "qt" to "qt4".

This is to not mix with any previous or future major version of Qt
(which will be binary and may be even source incompatible anyway).

Location:

packaging

Files:

• CreateRPMs.sh (modified) (1 diff)
• qt4.spec (moved) (moved from packaging/qt.spec ) (20 diffs)

packaging/CreateRPMs.sh

@@ -12 +12 @@
 #
 
-spec_file=qt.spec
+spec_file=qt4.spec
 
 #

packaging/qt4.spec

@@ -6 +6 @@
 #
 
-Name:       qt
+Name:       qt4
 Vendor:     netlabs.org
 License:    LGPLv2 with exceptions or GPLv3 with exceptions
@@ -28 +28 @@
 %define pkg_wps_view_txt()      EXENAME=e.exe;PROGTYPE=PROG_PM;PARAMETERS=((%*))
 
-%define pkg_docdir      %{_docdir}/%{qtM}
+%define pkg_docdir      %{_docdir}/%{name}
 
 %if 0%{?os2_release}
@@ -65 +65 @@
 
 # installation paths
-%define qt_prefix           %{_libdir}/%{qtM}
+%define qt_prefix           %{_libdir}/%{name}
 %define qt_libdir           %{_libdir}
-%define qt_headerdir        %{_includedir}/qt4
+%define qt_headerdir        %{_includedir}/%{name}
 %define qt_bindir           %{qt_prefix}/bin
 %define qt_plugindir        %{qt_prefix}/plugins
@@ -73 +73 @@
 %define qt_demosdir         %{qt_prefix}/demos
 %define qt_examplesdir      %{qt_prefix}/examples
-%define qt_datadir          %{_datadir}/%{qtM}
+%define qt_datadir          %{_datadir}/%{name}
 %define qt_docdir           %{qt_datadir}/doc
 %define qt_translationdir   %{qt_datadir}/translations
 %define qt_sysconfdir       %{_sysconfdir}/xdg
 
-%define qtM                 %{name}%{ver_major}
-
 # disable lxlite compression (Qt EXEs and DLLs are already compressed)
 %define __os_install_post       %{nil}
@@ -87 +85 @@
 #------------------------------------------------------------------------------
 
-Summary:    Qt runtime
+Summary:    Qt 4 runtime
 Group:      System Environment/Libraries
-
-Provides:   %{qtM} = %{version}-%{release}
 
 %description
@@ -143 +139 @@
 #------------------------------------------------------------------------------
 
-Summary:    Qt GUI runtime
+Summary:    Qt 4 GUI runtime
 Group:      System Environment/Libraries
 
 Requires:   %{name} = %{version}-%{release}
-
-Provides:   %{qtM}-pm = %{version}-%{release}
 
 %description pm
@@ -180 +174 @@
 #------------------------------------------------------------------------------
 
-Summary:    Qt WebKit runtime
+Summary:    Qt 4 WebKit runtime
 Group:      System Environment/Libraries
 
 Requires:   %{name}-pm = %{version}-%{release}
-
-Provides:   %{qtM}-webkit = %{version}-%{release}
 
 %description webkit
@@ -202 +194 @@
 %package demos
 #------------------------------------------------------------------------------
-Summary:    Qt demos and examples
+Summary:    Qt 4 demos and examples
 Group:      Documentation
 
 Requires:   %{name}-pm = %{version}-%{release}
 Requires:   %{name}-webkit = %{version}-%{release}
-
-Provides:   %{qtM}-demos = %{version}-%{release}
 
 %description demos
@@ -238 +228 @@
 %package qmlviewer
 #------------------------------------------------------------------------------
-Summary:    Qt QML Viewer tool
+Summary:    Qt 4 QML Viewer tool
 Group:      Development/Tools
 
 Requires:   %{name}-pm = %{version}-%{release}
-
-Provides:   %{qtM}-qmlviewer = %{version}-%{release}
 
 %description qmlviewer
@@ -266 +254 @@
 %package linguist
 #------------------------------------------------------------------------------
-Summary:    Qt Linguist tool
+Summary:    Qt 4 Linguist tool
 Group:      Development/Tools
 
 Requires:   %{name}-pm = %{version}-%{release}
-
-Provides:   %{qtM}-linguist = %{version}-%{release}
 
 %description linguist
@@ -299 +285 @@
 %package assistant
 #------------------------------------------------------------------------------
-Summary:    Qt Assistant tool
+Summary:    Qt 4 Assistant tool
 Group:      Development/Tools
 
 Requires:   %{name}-pm = %{version}-%{release}
-
-Provides:   %{qtM}-assistant = %{version}-%{release}
 
 %description assistant
@@ -330 +314 @@
 %package designer
 #------------------------------------------------------------------------------
-Summary:    Qt Designer tool
+Summary:    Qt 4 Designer tool
 Group:      Development/Tools
 
 Requires:   %{name}-pm = %{version}-%{release}
-
-Provides:   %{qtM}-designer = %{version}-%{release}
 
 %description designer
@@ -363 +345 @@
 %package devel-tools
 #------------------------------------------------------------------------------
-Summary:    Qt development tools
+Summary:    Qt 4 development tools
 Group:      Development/Tools
 
 Requires:   %{name}-pm = %{version}-%{release}
-
-Provides:   %{qtM}-devel-tools = %{version}-%{release}
 
 %description devel-tools
@@ -392 +372 @@
 %package doc
 #------------------------------------------------------------------------------
-Summary:    API documentation for Qt
+Summary:    Qt 4 API documentation
 Group:      Documentation
 BuildArch:  noarch
@@ -398 +378 @@
 Requires:   %{name}-assistant = %{version}-%{release}
 
-Provides:   %{qtM}-doc = %{version}-%{release}
-
 %description doc
 %{descr_brief}
@@ -413 +391 @@
 %package devel
 #------------------------------------------------------------------------------
-Summary:    Development files for Qt
+Summary:    Qt 4 development files
 Group:      Development/Libraries
 
 Requires:   %{name}-pm = %{version}-%{release}
-
-Provides:   %{qtM}-devel = %{version}-%{release}
 
 %description devel
@@ -457 +433 @@
 %package webkit-devel
 #------------------------------------------------------------------------------
-Summary:    Development files for Qt WebKit
+Summary:    Qt 4 WebKit development files
 Group:      Development/Libraries
 
 Requires:   %{name}-webkit = %{version}-%{release}
 Requires:   %{name}-devel = %{version}-%{release}
-
-Provides:   %{qtM}-webkit-devel = %{version}-%{release}
 
 %description webkit-devel
@@ -484 +458 @@
 %package devel-all
 #------------------------------------------------------------------------------
-Summary:    Qt development kit
+Summary:    Qt 4 development kit
 Group:      Development/Libraries
 
@@ -497 +471 @@
 Requires:   %{name}-webkit-devel = %{version}-%{release}
 
-Provides:   %{qtM}-devel-all = %{version}-%{release}
-
 %description devel-all
 %{descr_brief}
@@ -504 +476 @@
 This meta package installs all individual packages containing various Qt
 development components, including the Qt headers and libraries, the Linguist,
-Assistant and designer Designer applications, development tools, example
+Assistant and Designer applications, development tools, example
 Qt applications and the API documentation.