From e664047195f9341d8af75e70168f5faa85a1da5b Mon Sep 17 00:00:00 2001 From: zhuchunyi Date: Wed, 6 Nov 2019 19:07:00 +0800 Subject: [PATCH] update code --- fltk.spec | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/fltk.spec b/fltk.spec index 3c22c7d..98abc6b 100644 --- a/fltk.spec +++ b/fltk.spec @@ -2,7 +2,7 @@ Name: fltk Version: 1.3.4 -Release: 8 +Release: 9 Summary: C++ user interface toolkit License: LGPLv2+ with exceptions URL: http://www.fltk.org/ @@ -15,8 +15,8 @@ Patch0001: fltk-1.3.4-fltk_config.patch #PATCH-FIX-https://bugzilla.redhat.com/ Patch0002: fltk-1.3.4-x-fluid_mimetype.patch -Provides: %{name}-static %{name}-fluid -Obsoletes: %{name}-static %{name}-fluid +Provides: %{name}-fluid = %{version}-%{release} +Obsoletes: %{name}-fluid < %{version}-%{release} BuildRequires: gcc-c++ desktop-file-utils libjpeg-devel pkgconfig(libpng) pkgconfig(gl) pkgconfig(glu) pkgconfig(ice) BuildRequires: pkgconfig(sm) pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11) @@ -30,6 +30,8 @@ the bloat, and supports 3D graphics via OpenGL and its built-in GLUT emulation. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} libstdc++-devel pkgconfig(gl) pkgconfig(glu) Requires: pkgconfig(ice) pkgconfig(sm) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11) +Provides: %{name}-static = %{version}-%{release} +Obsoletes: %{name}-static < %{version}-%{release} %description devel @@ -38,13 +40,7 @@ Microsoft(r) Windows(r), and MacOS(r) X. FLTK provides modern GUI functionality graphics via OpenGL(r) and its built-in GLUT emulation. It was originally developed by Mr. Bill Spitzak and is currently maintained by a small group of developers across the world with a central repository -%package help -Summary: Documents for autogen -Buildarch: noarch -Requires: man - -%description help -Man pages and other related documents. +%package_help %prep %autosetup -n %{name}-%{version}-1 -p1 @@ -96,27 +92,35 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop %postun -p /sbin/ldconfig %files -%doc ANNOUNCEMENT CHANGES CREDITS README +%defattr(-,root,root) %license COPYING -%{_libdir}/*.so.* %{_bindir}/fluid -%{_datadir}/applications/fluid.desktop +%{_libdir}/*.so.* %{_datadir}/icons/hicolor/*/*/* +%{_datadir}/applications/fluid.desktop %files devel +%defattr(-,root,root) %{_bindir}/fltk-config %{?arch:%{_bindir}/fltk-config-%{arch}} +%{_libdir}/*.a +%{_libdir}/*.so %{_includedir}/FL/ %{_includedir}/Fl -%{_libdir}/*.so -%{_libdir}/*.a %files help +%defattr(-,root,root) +%doc README* ANNOUNCEMENT CHANGES* CREDITS __docs/* %{_mandir}/man1/fltk-config.1* %{_mandir}/man3/fltk.3* %{_mandir}/man1/fluid.1* -%doc __docs/* %changelog +* Thu Oct 31 2019 openEuler Buildteam - 1.3.4-9 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:modify the static package + * Wed Sep 11 2019 openEuler jimmy - 1.3.4-8 - Package init jimmy