From c1679dc6a38cdbd6330d00ddb5832d1845003197a0c4d0f4580feaf97911a10e Mon Sep 17 00:00:00 2001 From: Dmitry Roshchin Date: Mon, 25 Mar 2013 14:20:03 +0000 Subject: [PATCH] Accepting request 160943 from home:worldcitizen:branches:science Added BuildRequires: glu-devel as it's not a BuildRequirement for Mesa-devel anymore for openSUSE > 12.2 Cleaned the spec file up Corrected the package names OBS-URL: https://build.opensuse.org/request/show/160943 OBS-URL: https://build.opensuse.org/package/show/science/qwtplot3d?expand=0&rev=3 --- libqwtplot3d.spec | 89 ------------------------------------ libqwtplot3d0.changes | 2 - qwtplot3d.changes | 13 ++++++ qwtplot3d.spec | 103 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 91 deletions(-) delete mode 100644 libqwtplot3d.spec delete mode 100644 libqwtplot3d0.changes create mode 100644 qwtplot3d.changes create mode 100644 qwtplot3d.spec diff --git a/libqwtplot3d.spec b/libqwtplot3d.spec deleted file mode 100644 index dc7c234..0000000 --- a/libqwtplot3d.spec +++ /dev/null @@ -1,89 +0,0 @@ -# -# spec file for package libqwtplot3d (0.2.7) -# -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. -# -# norootforbuild - -%define realname libqwtplot3d -%define soname 0 - -Name: %{realname}%{soname} -Summary: QwtPlot3D a feature-rich Qt/OpenGL-based C++ programming library -Version: 0.2.7 -Release: 4.1 -License: zlib -Group: Development/Libraries/C and C++ -URL: http://qwtplot3d.sourceforge.net/ -Source0: qwtplot3d-%{version}.tar.bz2 -Patch0: qwtplot3d-gcc43.patch -Patch1: glu_include.patch - -%if 0%{?suse_version} < 1120 || 0%{?sles_version} <= 11 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif -Autoreqprov: on -BuildRequires: qt-devel Mesa-devel - -%description -QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++ -programming library. It provides essentially a bunch of 3D-widgets -for programmers. The library is zlib licensed. - -%package -n %{realname}-devel -Summary: Development tools for programs which uses QwtPlot3D Widget set -Group: Development/Libraries/C and C++ -Requires: %{name} = %{version}-%{release} -Requires: qt-devel - -%description -n %{realname}-devel -QwtPlot3D is a feature-rich Qt/OpenGL-based C++ programming library. -It provides essentially a bunch of 3D-widgets for programmers. - -%prep -%setup -q -n qwtplot3d -%patch0 -p1 -%patch1 -p0 - -%build -qmake qwtplot3d.pro -o Makefile -%{__make} %{?jobs:-j%{jobs}} - - -%install -%__mkdir -p %{buildroot}%{_includedir}/qwtplot3d -%__mkdir -p %{buildroot}%{_libdir} - -for n in include/*.h ; do - %__install -m 644 $n %{buildroot}%{_includedir}/qwtplot3d -done - -# install, preserving links -chmod 644 lib/libqwtplot3d.so* -for n in lib/libqwtplot3d.so* ; do - cp -d $n %{buildroot}%{_libdir} -done - -%if 0%{?suse_version} < 1120 || 0%{?sles_version} <= 11 -%clean -%{__rm} -rf '%{buildroot}' -%endif - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root) -%{_libdir}/%{realname}.so.* - - -%files -n %{realname}-devel -%defattr(-,root,root) -%doc examples -%{_libdir}/%{realname}.so -%dir %{_includedir}/qwtplot3d -%{_includedir}/qwtplot3d/qwt3d*.h - -%changelog diff --git a/libqwtplot3d0.changes b/libqwtplot3d0.changes deleted file mode 100644 index 5d5f4c3..0000000 --- a/libqwtplot3d0.changes +++ /dev/null @@ -1,2 +0,0 @@ -* Wed Mar 17 2010 Malcolm Lewis - 0.2.7 -- initial package for OBS based on packman version \ No newline at end of file diff --git a/qwtplot3d.changes b/qwtplot3d.changes new file mode 100644 index 0000000..91351bd --- /dev/null +++ b/qwtplot3d.changes @@ -0,0 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 25 12:16:03 UTC 2013 - joop.boonen@opensuse.org + +- Added BuildRequires: glu-devel as it's not a BuildRequirement + for Mesa-devel anymore for openSUSE > 12.2 +- Cleaned the spec file up +- Corrected the package names + +------------------------------------------------------------------- +Wed Mar 17 00:00:00 UTC 2010 - coyoteuser@gmail.com + +- initial package for OBS based on packman version + diff --git a/qwtplot3d.spec b/qwtplot3d.spec new file mode 100644 index 0000000..ae9e3eb --- /dev/null +++ b/qwtplot3d.spec @@ -0,0 +1,103 @@ +# +# spec file for package qwtplot3d +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define soname 0 +Name: qwtplot3d +Version: 0.2.7 +Release: 0 +Summary: A feature-rich Qt/OpenGL-based C++ programming library +License: Zlib +Group: Development/Libraries/C and C++ +Url: http://qwtplot3d.sourceforge.net/ +Source0: qwtplot3d-%{version}.tar.bz2 +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch0: qwtplot3d-gcc43.patch +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines +Patch1: glu_include.patch +BuildRequires: Mesa-devel +BuildRequires: dos2unix +%if 0%{?suse_version} > 1220 +BuildRequires: glu-devel +%endif +BuildRequires: qt-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++ +programming library. It provides essentially a bunch of 3D-widgets +for programmers. The library is zlib licensed. + +%package -n lib%{name}%{soname} +Summary: Development tools for programs which uses QwtPlot3D Widget set +Group: Development/Libraries/C and C++ + +%description -n lib%{name}%{soname} +QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++ +programming library. It provides essentially a bunch of 3D-widgets +for programmers. The library is zlib licensed. + +%package devel +Summary: Development tools for programs which uses QwtPlot3D Widget set +Group: Development/Libraries/C and C++ +Requires: lib%{name}%{soname} = %{version} +Requires: qt-devel + +%description devel +QwtPlot3D is a feature-rich Qt/OpenGL-based C++ programming library. +It provides essentially a bunch of 3D-widgets for programmers. + +%prep +%setup -q -n qwtplot3d +%patch0 -p1 +%patch1 -p0 +dos2unix COPYING +find examples -type f -exec dos2unix {} \; + +%build +qmake qwtplot3d.pro -o Makefile +make %{?_smp_mflags} + +%install +mkdir -p %{buildroot}%{_includedir}/qwtplot3d +mkdir -p %{buildroot}%{_libdir} +for n in include/*.h ; do + install -m 644 $n %{buildroot}%{_includedir}/qwtplot3d +done +# install, preserving links +chmod 644 lib/libqwtplot3d.so* +for n in lib/libqwtplot3d.so* ; do + cp -d $n %{buildroot}%{_libdir} +done + +%post -n lib%{name}%{soname} -p /sbin/ldconfig + +%postun -n lib%{name}%{soname} -p /sbin/ldconfig + +%files -n lib%{name}%{soname} +%defattr(-,root,root) +%doc COPYING +%{_libdir}/lib%{name}.so.* + +%files devel +%defattr(-,root,root) +%doc COPYING examples +%{_libdir}/lib%{name}.so +%dir %{_includedir}/qwtplot3d +%{_includedir}/qwtplot3d/qwt3d*.h + +%changelog