Hello community, here is the log from the commit of package qwt for openSUSE:Factory checked in at 2011-12-02 13:22:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qwt (Old) and /work/SRC/openSUSE:Factory/.qwt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qwt", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/qwt/qwt.changes 2011-10-24 14:01:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qwt.new/qwt.changes 2011-12-02 13:22:34.000000000 +0100 @@ -1,0 +2,31 @@ +Wed Nov 30 08:45:45 UTC 2011 - [email protected] + +- Add Provides for qwt package, no need for obsoletes since the base + package never really existed. +- Simplify filelist + +------------------------------------------------------------------- +Tue Nov 29 07:15:09 UTC 2011 - [email protected] + +- removed dependency of the devel package to the (non-existing) + base package + +------------------------------------------------------------------- +Mon Nov 28 13:36:55 UTC 2011 - [email protected] + +- Remove nearly empty qwt base package again + +------------------------------------------------------------------- +Sat Nov 26 01:13:23 UTC 2011 - [email protected] + +- readd tests for other distributions +- cleanup doc files + * mv pdf to devel-doc + * mv man to devel-doc +- CHANGES, COPYING, README to qwt pkg + * no extra files in libqwt5 pkg +- fix rpmlintrc file +- fix build for SLE_10 + * directories not owned by a package: %{_libdir}/qt4/.... + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qwt.spec ++++++ --- /var/tmp/diff_new_pack.GMNURo/_old 2011-12-02 13:22:37.000000000 +0100 +++ /var/tmp/diff_new_pack.GMNURo/_new 2011-12-02 13:22:37.000000000 +0100 @@ -15,28 +15,33 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: qwt +%define lname libqwt5 +Summary: Qt Widgets for Technical Applications Version: 5.2.2 -Release: 3 +Release: 1 License: Qwt License 1.0 -Summary: Qt Widgets for Technical Applications -Url: http://qwt.sourceforge.net/ Group: Development/Libraries/C and C++ -Source: %{name}-%{version}.tar.bz2 -Source2: %{name}-rpmlintrc +Url: http://qwt.sourceforge.net/ +Source: http://switch.dl.sourceforge.net/sourceforge/qwt/qwt-%{version}.tar.bz2 +Source2: qwt-rpmlintrc Source3: %{name}-%{version}.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-build - -BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: libpng-devel + +%if 0%{?mandriva_version} || 0%{?mdkversion} +BuildRequires: libqt-devel +%else BuildRequires: qt-devel +%endif -Requires: libqwt5 = %{version} +%if 0%{?suse_version} >= 1100 +BuildRequires: fdupes +%endif %description The Qwt library contains GUI Components and utility classes which are @@ -45,41 +50,39 @@ wheels and knobs to control or display values, arrays, or ranges of type double. -%package -n libqwt5 - - +%package -n %{lname} Summary: Shared library for Qt Widgets Group: Development/Libraries/C and C++ -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} -%description -n libqwt5 +%description -n %{lname} This package contains the shared library to run Technical Applications -developed with/for Qwt. +developed with/for qwt. %package devel - - Summary: Include headers and Qt Designer plugin for Qwt Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{lname} = %{version} Requires: freetype2-devel Requires: gcc-c++ Requires: libpng-devel +%if 0%{?mandriva_version} || 0%{?mdkversion} +Requires: libqt-devel +%else Requires: qt-devel +%endif +%if 0%{?suse_version} >= 1100 Recommends: %{name}-devel-doc -Recommends: %{name}-devel-doc-pdf Recommends: %{name}-examples +%endif Obsoletes: libqwt5-devel < %{version} Provides: libqwt5-devel = %{version} +Provides: qwt = %{version} %description devel This package contains the header files of Qwt and its Qt designer plugin in order to create Qt applications using the Qwt widgets. %package examples - - Summary: Example programs using Qwt Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} @@ -90,20 +93,20 @@ This package contains example programs demonstrating the Qwt widgets. %package designer - - Summary: Plugin for the Qt Interface designer Group: Development/Tools/IDE Requires: %{name}-devel = %{version} +%if 0%{?mandriva_version} || 0%{?mdkversion} +Requires: libqt-devel +%else Requires: qt-devel +%endif %description designer The %{name}-designer package contains the plugin for the Qt User Interface designer tool. %package devel-doc - - Summary: Development documentation for Qwt Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} @@ -114,24 +117,17 @@ This package contains the development documentation of the Qwt widgets as is it created by doxygen. -%package devel-doc-pdf - - -Summary: Development documentation for Qwt in pdf format -Group: Development/Libraries/C and C++ -Requires: %{name}-devel = %{version} -Obsoletes: libqwt5-devel-doc-pdf < %{version} -Provides: libqwt5-devel-doc-pdf = %{version} - -%description devel-doc-pdf -This package contains the development documentation of the Qwt widgets -in pdf format. - %prep %setup -q %build -cp %{SOURCE3} ./ +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +export PATH=%{_libdir}/qt4/bin/:$PATH +%endif +%if 0%{?mandriva_version} == 2008 || 0%{?mdkversion} == 200800 +export PATH=/usr/lib/qt4/bin/:$PATH +%endif + # Now build the qwt5 library qmake \ INSTALLBASE=%{_prefix} \ @@ -139,7 +135,7 @@ QMAKE_CXXFLAGS="%{optflags}" \ target.path=%{_libdir} \ headers.path=%{_includedir}/%{name}5 \ - doc.path=%{_docdir}/%{name}/devel-doc + doc.path=%{_docdir}/%{name}-devel-doc make %{?_smp_mflags} @@ -147,51 +143,60 @@ %makeinstall INSTALL_ROOT=%{buildroot} # man mkdir -p %{buildroot}/%{_mandir} -mv -v %{buildroot}/%{_docdir}/%{name}/devel-doc/man/man3 %{buildroot}/%{_mandir}/ +mv -v %{buildroot}/%{_docdir}/%{name}-devel-doc/man/man3 %{buildroot}/%{_mandir}/ # docu -mv -v examples %{buildroot}%{_docdir}/%{name}/ -mkdir -p %{buildroot}%{_docdir}/%{name}/devel-doc-pdf -mv -v %{name}-%{version}.pdf %{buildroot}%{_docdir}/%{name}/devel-doc-pdf/ +install -m0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}-devel-doc/%{name}.pdf # designer plugin +%if 0%{?mandriva_version} == 2008 || 0%{?mdkversion} == 200800 +mkdir -p %{buildroot}/%{_prefix}/lib/qt4/plugins/designer +mv -v %{buildroot}/%{_libdir}/libqwt_designer_plugin.so %{buildroot}/%{_prefix}/lib/qt4/plugins/designer/ +%else mkdir -p %{buildroot}/%{_libdir}/qt4/plugins/designer mv -v %{buildroot}/%{_libdir}/libqwt_designer_plugin.so %{buildroot}/%{_libdir}/qt4/plugins/designer/ +%endif +%if 0%{?suse_version} >= 1100 %fdupes %{buildroot} +%endif -%post -n libqwt5 -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%postun -n libqwt5 -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig %clean rm -rf %{buildroot} -%files -n libqwt5 +%files -n %{lname} %defattr(-,root,root) +%doc CHANGES COPYING README %{_libdir}/libqwt*.so.* -%doc COPYING CHANGES README %files designer %defattr(-,root,root) +%if 0%{?mandriva_version} == 2008 || 0%{?mdkversion} == 200800 +%{_prefix}/lib/qt4/plugins/designer/libqwt_designer_plugin.so +%else +%if 0%{suse_version} < 1030 +# directories not owned by a package: +%dir %{_libdir}/qt4 +%dir %{_libdir}/qt4/plugins +%dir %{_libdir}/qt4/plugins/designer +%endif %{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so +%endif %files devel %defattr(-,root,root) %{_libdir}/libqwt*.so -%{_includedir}/%{name}5 -%{_mandir}/man3/* +%dir %{_includedir}/%{name}5 +%{_includedir}/%{name}5/*.h %files examples %defattr(-,root,root) -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/examples - -%files devel-doc-pdf -%defattr(-,root,root) -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/devel-doc-pdf +%doc examples %files devel-doc %defattr(-,root,root) -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/devel-doc +%doc %{_docdir}/%{name}-devel-doc +%{_mandir}/man3/* %changelog ++++++ qwt-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.GMNURo/_old 2011-12-02 13:22:37.000000000 +0100 +++ /var/tmp/diff_new_pack.GMNURo/_new 2011-12-02 13:22:37.000000000 +0100 @@ -1,9 +1,7 @@ # Those files are examples - taking for learning... -addFilter("arch-dependent-file-in-usr-share.*/usr/share/doc/packages/qwt/examples/.*") -addFilter("unstripped-binary-or-object.*/usr/share/doc/packages/qwt/examples/.*") +addFilter("arch-dependent-file-in-usr-share.*/usr/share/doc/packages/qwt-examples/.*") +addFilter("unstripped-binary-or-object.*/usr/share/doc/packages/qwt-examples/.*") # qwt-designer needs qt4 designer included in the libqt4-devel package addFilter("explicit-lib-dependency.*libqt4-devel") # -doc and -example package contains files only needed if someone installs the devel package addFilter("devel-dependency.*qwt-devel") -addFilter("devel-dependency.*qwt-devel") -addFilter("devel-dependency.*qwt-devel") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
