Changeset 1083


Ignore:
Timestamp:
Sep 13, 2011, 11:28:04 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

packaging: Add lib prefix to all library packages and add libqt4-designer.

The lib prefix is necessary to distinguish between packages containing
applications and libraries (DLLs) of the same name, e.g. like in case of
Qt Designer. It also matches the common practice on other platforms.

Location:
packaging
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • packaging/INSTALL.OS2

    r1063 r1083  
    2525
    2626If you want to only install the Qt runtime itself (for example, to use it with
    27 an application not available in RPM repositories), type the following:
     27an application not available in RPM repositories), type e.g. the following:
    2828
    29   yum install qt qt-pm
     29  yum install libqt4 libqt4-gui
    3030
    3131To get more information about installing RPM, please visit

  • packaging/INSTALL.OS2.develop

    r1063 r1083  
    1919environment:
    2020
    21   yum install qt-develop
     21  yum install qt4-devel-kit
    2222 
    2323To get more information about installing RPM, please visit

  • packaging/qt4.spec

    r1082 r1083  
    8585#------------------------------------------------------------------------------
    8686
    87 Summary:    Qt 4 runtime
     87Summary:    Qt 4 (dummy package)
    8888Group:      System Environment/Libraries
    8989
    9090%description
     91%{descr_brief}
     92
     93This package is not actually generated (due to the missing %files section).
     94It is present only because RPM requires Summary: and %description sections for
     95the main package to exist.
     96
     97#------------------------------------------------------------------------------
     98%package -n lib%{name}
     99#------------------------------------------------------------------------------
     100
     101Summary:    Qt 4 runtime libraries
     102Group:      System Environment/Libraries
     103
     104%description -n lib%{name}
    91105%{descr_brief}
    92106
    … …  
    94108core, network and XML modules.
    95109
    96 %files
     110%files -n lib%{name}
    97111%defattr(-,root,root,-)
    98112%dir %{pkg_docdir}/
    … …  
    132146%{qt_libdir}/QtXmlP%{ver_major}.dll
    133147
    134 %pre
     148%pre -n lib%{name}
    135149%warpin_conflicts_begin
    136150netlabs.org\Qt4\Runtime
    137151%warpin_conflicts_end
    138152
    139 %post
     153%post -n lib%{name}
    140154# clean up the plugin/font cache to remove old entries (@todo other users?)
    141155rm -f "$HOME/.config/Trolltech.ini"
    142156
    143157#------------------------------------------------------------------------------
    144 %package sql-mysql
     158%package -n lib%{name}-sql-mysql
    145159#------------------------------------------------------------------------------
    146160
    … …  
    148162Group:      System Environment/Libraries
    149163
    150 Requires:   %{name} = %{version}-%{release}
    151 
    152 %description sql-mysql
     164Requires:   lib%{name} = %{version}-%{release}
     165
     166%description -n lib%{name}-sql-mysql
    153167%{descr_brief}
    154168
    155169This package contains the MySQL plugin for Qt 4.
    156170
    157 %files sql-mysql
     171%files -n lib%{name}-sql-mysql
    158172%defattr(-,root,root,-)
    159173%{qt_plugindir}/sqldrivers/qmysql%{ver_major}.dll
    160174
    161175#------------------------------------------------------------------------------
    162 %package sql-psql
     176%package -n lib%{name}-sql-psql
    163177#------------------------------------------------------------------------------
    164178
    … …  
    166180Group:      System Environment/Libraries
    167181
    168 Requires:   %{name} = %{version}-%{release}
    169 
    170 %description sql-psql
     182Requires:   lib%{name} = %{version}-%{release}
     183
     184%description -n lib%{name}-sql-psql
    171185%{descr_brief}
    172186
    173187This package contains the PostgreSQL plugin for Qt 4.
    174188
    175 %files sql-psql
     189%files -n lib%{name}-sql-psql
    176190%defattr(-,root,root,-)
    177191%{qt_plugindir}/sqldrivers/qpsql%{ver_major}.dll
    178192
    179193#------------------------------------------------------------------------------
    180 %package pm
    181 #------------------------------------------------------------------------------
    182 
    183 Summary:    Qt 4 GUI runtime
     194%package -n lib%{name}-gui
     195#------------------------------------------------------------------------------
     196
     197Summary:    Qt 4 GUI runtime libraries
    184198Group:      System Environment/Libraries
    185199
    186 Requires:   %{name} = %{version}-%{release}
    187 
    188 %description pm
     200Requires:   lib%{name} = %{version}-%{release}
     201
     202%description -n lib%{name}-gui
    189203%{descr_brief}
    190204
    … …  
    192206applications.
    193207
    194 %files pm
     208%files -n lib%{name}-gui
    195209%defattr(-,root,root,-)
    196210%dir %{qt_plugindir}/designer
    … …  
    213227
    214228#------------------------------------------------------------------------------
    215 %package webkit
    216 #------------------------------------------------------------------------------
    217 
    218 Summary:    Qt 4 WebKit runtime
     229%package -n lib%{name}-webkit
     230#------------------------------------------------------------------------------
     231
     232Summary:    Qt 4 WebKit runtime libraries
    219233Group:      System Environment/Libraries
    220234
    221 Requires:   %{name}-pm = %{version}-%{release}
    222 
    223 %description webkit
     235Requires:   lib%{name}-gui = %{version}-%{release}
     236
     237%description -n lib%{name}-webkit
    224238%{descr_brief}
    225239
    … …  
    227241technology.
    228242
    229 %files webkit
     243%files -n lib%{name}-webkit
    230244%defattr(-,root,root,-)
    231245%{qt_plugindir}/designer/qwebv.dll
    … …  
    234248
    235249#------------------------------------------------------------------------------
     250%package -n lib%{name}-designer
     251#------------------------------------------------------------------------------
     252
     253Summary:    Qt 4 Designer runtime libraries
     254Group:      System Environment/Libraries
     255
     256Requires:   lib%{name}-gui = %{version}-%{release}
     257
     258%description -n lib%{name}-designer
     259%{descr_brief}
     260
     261This package contains runtime Qt libraries for Designer components.
     262
     263%files -n lib%{name}-designer
     264%defattr(-,root,root,-)
     265%{qt_libdir}/QtDsgC%{ver_major}.dll
     266%{qt_libdir}/QtDsgn%{ver_major}.dll
     267
     268#------------------------------------------------------------------------------
    236269%package demos
    237270#------------------------------------------------------------------------------
    … …  
    239272Group:      Documentation
    240273
    241 Requires:   %{name}-pm = %{version}-%{release}
    242 Requires:   %{name}-designer = %{version}-%{release}
    243 Requires:   %{name}-webkit = %{version}-%{release}
     274Requires:   lib%{name}-gui = %{version}-%{release}
     275Requires:   lib%{name}-designer = %{version}-%{release}
     276Requires:   lib%{name}-webkit = %{version}-%{release}
    244277Requires:   %{name}-doc = %{version}-%{release}
    245278
    … …  
    279312Group:      Development/Tools
    280313
    281 Requires:   %{name}-pm = %{version}-%{release}
     314Requires:   lib%{name}-gui = %{version}-%{release}
    282315
    283316%description qmlviewer
    … …  
    305338Group:      Development/Tools
    306339
    307 Requires:   %{name}-pm = %{version}-%{release}
     340Requires:   lib%{name}-gui = %{version}-%{release}
    308341
    309342%description linguist
    … …  
    336369Group:      Development/Tools
    337370
    338 Requires:   %{name}-pm = %{version}-%{release}
     371Requires:   lib%{name}-gui = %{version}-%{release}
    339372
    340373%description assistant
    … …  
    370403Group:      Development/Tools
    371404
    372 Requires:   %{name}-pm = %{version}-%{release}
     405Requires:   lib%{name}-gui = %{version}-%{release}
     406Requires:   lib%{name}-designer = %{version}-%{release}
    373407
    374408%description designer
    … …  
    382416%{qt_translationdir}/designer_??.qm
    383417%{qt_translationdir}/designer_??_??.qm
    384 %{qt_libdir}/QtDsgC%{ver_major}.dll
    385 %{qt_libdir}/QtDsgn%{ver_major}.dll
    386418%{qt_bindir}/designer.exe
    387419
    … …  
    401433Group:      Development/Tools
    402434
    403 Requires:   %{name}-pm = %{version}-%{release}
     435Requires:   lib%{name}-gui = %{version}-%{release}
    404436
    405437%description devel-tools
    … …  
    465497
    466498#------------------------------------------------------------------------------
    467 %package devel
     499%package -n lib%{name}-devel
    468500#------------------------------------------------------------------------------
    469501Summary:    Qt 4 development files
    470502Group:      Development/Libraries
    471503
    472 Requires:   %{name}-pm = %{version}-%{release}
    473 
    474 %description devel
     504Requires:   lib%{name}-gui = %{version}-%{release}
     505
     506%description -n lib%{name}-devel
    475507%{descr_brief}
    476508
    … …  
    478510applications using the Qt toolkit.
    479511
    480 %files devel
     512%files -n lib%{name}-devel
    481513%defattr(-,root,root,-)
    482514%if "%{qt_headerdir}" != "%{_includedir}"
    … …  
    507539
    508540#------------------------------------------------------------------------------
    509 %package webkit-devel
     541%package -n lib%{name}-webkit-devel
    510542#------------------------------------------------------------------------------
    511543Summary:    Qt 4 WebKit development files
    512544Group:      Development/Libraries
    513545
    514 Requires:   %{name}-webkit = %{version}-%{release}
    515 Requires:   %{name}-devel = %{version}-%{release}
    516 
    517 %description webkit-devel
     546Requires:   lib%{name}-webkit = %{version}-%{release}
     547Requires:   lib%{name}-devel = %{version}-%{release}
     548
     549%description -n lib%{name}-webkit-devel
    518550%{descr_brief}
    519551
    … …  
    521553develop applications using the Qt WebKit technology.
    522554
    523 %files webkit-devel
     555%files -n lib%{name}-webkit-devel
    524556%defattr(-,root,root,-)
    525557%{qt_headerdir}/Qt/QtWebKit
    … …  
    532564
    533565#------------------------------------------------------------------------------
    534 %package devel-all
     566%package devel-kit
    535567#------------------------------------------------------------------------------
    536568Summary:    Qt 4 development kit
    … …  
    544576Requires:   %{name}-devel-tools = %{version}-%{release}
    545577Requires:   %{name}-doc = %{version}-%{release}
    546 Requires:   %{name}-devel = %{version}-%{release}
    547 Requires:   %{name}-webkit-devel = %{version}-%{release}
    548 
    549 %description devel-all
     578Requires:   lib%{name}-devel = %{version}-%{release}
     579Requires:   lib%{name}-webkit-devel = %{version}-%{release}
     580
     581%description devel-kit
    550582%{descr_brief}
    551583
    … …  
    555587Qt applications and the API documentation.
    556588
    557 %files devel-all
     589%files devel-kit
    558590
    559591#------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.