diff --git a/plotutils.changes b/plotutils.changes index fa9bdd0..25f9564 100644 --- a/plotutils.changes +++ b/plotutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 6 13:20:52 UTC 2012 - pgajdos@suse.com + +- prepare spec file for dropping SuSEconfig.fonts (openFATE#313536) + ------------------------------------------------------------------- Wed Nov 16 08:19:58 UTC 2011 - coolo@suse.com diff --git a/plotutils.spec b/plotutils.spec index fdd8d2e..f2d0683 100644 --- a/plotutils.spec +++ b/plotutils.spec @@ -1,7 +1,7 @@ # # spec file for package plotutils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,23 +16,28 @@ # - Name: plotutils -BuildRequires: bison flex gcc-c++ libpng-devel libtool xorg-x11-devel zlib-devel -License: GPL-2.0+ ; GPL-3.0+ +BuildRequires: bison +BuildRequires: flex +BuildRequires: fontpackages-devel +BuildRequires: gcc-c++ +BuildRequires: libpng-devel +BuildRequires: libtool +BuildRequires: xorg-x11-devel +BuildRequires: zlib-devel Url: http://www.gnu.org/software/plotutils/plotutils.html -Group: Productivity/Graphics/Visualization/Graph PreReq: %install_info_prereq %suseconfig_fonts_prereq Version: 2.6 -Release: 1 +Release: 0 Summary: GNU Plotting Utilities +License: GPL-2.0+ ; GPL-3.0+ +Group: Productivity/Graphics/Visualization/Graph Source: %{name}-%{version}.tar.bz2 Patch: plotutils-man.patch Patch1: plotutils-uninitialized.patch Patch2: plotutils-dasharray-format.patch Patch3: plotutils-autoreconf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define fontdir %{_datadir}/fonts/misc %description The GNU plotting utilities consist of seven command line programs: the @@ -54,11 +59,14 @@ Authors: James J. Clark %package devel -License: GPL-2.0+ ; GPL-3.0+ Summary: GNU Plotting Utilities Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} libstdc++-devel xorg-x11-libX11-devel -Requires: libplot2 = %{version} libplotter2 = %{version} libxmi0 = %{version} +Requires: %{name} = %{version} +Requires: libplot2 = %{version} +Requires: libplotter2 = %{version} +Requires: libstdc++-devel +Requires: libxmi0 = %{version} +Requires: xorg-x11-libX11-devel %description devel The GNU plotting utilities consist of seven command line programs: the @@ -80,7 +88,6 @@ Authors: James J. Clark %package -n libplot2 -License: GPL-2.0+ ; GPL-3.0+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -104,7 +111,6 @@ Authors: James J. Clark %package -n libplotter2 -License: GPL-2.0+ ; GPL-3.0+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -128,7 +134,6 @@ Authors: James J. Clark %package -n libxmi0 -License: GPL-2.0+ ; GPL-3.0+ Summary: GNU Plotting Utilities Group: System/Libraries @@ -183,9 +188,9 @@ install -m 0644\ AUTHORS COMPAT COPYING INSTALL.fonts KNOWN_BUGS PROBLEMS README THANKS\ TODO $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} # -install -d $RPM_BUILD_ROOT%{fontdir} -install -m 0644 fonts/pcf/*.pcf $RPM_BUILD_ROOT%{fontdir} -gzip -9 ${RPM_BUILD_ROOT}%{fontdir}/*.pcf +install -d $RPM_BUILD_ROOT%{_miscfontsdir} +install -m 0644 fonts/pcf/*.pcf $RPM_BUILD_ROOT%{_miscfontsdir} +gzip -9 ${RPM_BUILD_ROOT}%{_miscfontsdir}/*.pcf # install -m 0644 manpage.1 $RPM_BUILD_ROOT%{_mandir}/man1/plotutils.1 ln -s plotutils.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/double.1.gz @@ -195,11 +200,14 @@ ln -s plotutils.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/pic2plot.1.gz %post %install_info --info-dir=%{_infodir} %{_infodir}/plotutils.info.gz -%run_suseconfig_fonts +%reconfigure_fonts_post %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/plotutils.info.gz -%run_suseconfig_fonts +%reconfigure_fonts_postun + +%posttrans +%reconfigure_fonts_posttrans %post devel %install_info --info-dir=%{_infodir} %{_infodir}/libxmi.info.gz @@ -228,7 +236,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %doc %{_infodir}/plotutils*.info* %doc %{_mandir}/man?/*.* -%{fontdir} +%{_miscfontsdir} %files devel %defattr(-,root,root)