[rpms/xfig] epel10: - Also compile a version against Xaw3d instead of plain Xaw, available in

[Hans de Goede <jwrdegoede@fedoraproject.org>]

            A new commit has been pushed.

            Repo   : rpms/xfig
            Branch : epel10
            Commit : d3b17b886690c8285d49fb247a03eb2c972471ac
            Author : Hans de Goede <jwrdegoede@fedoraproject.org>
            Date   : 2007-11-16T19:58:04+00:00
            Stats  : +91/-17 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/xfig/c/d3b17b886690c8285d49fb247a03eb2c972471ac?branch=epel10

            Log:
            - Also compile a version against Xaw3d instead of plain Xaw, available in
    the new xfig-Xaw3d package
- Various specfile cleanups for packaging guidelines compliance
- Remove spurious executable permissions on various files (bz 247424)
- Apply patch fixing problems with xfig not finding fonts (bz 210278)

---
diff --git a/xfig.spec b/xfig.spec
index 1490b24..f7bf385 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -1,25 +1,26 @@
 %define app_defaults_dir %{_datadir}/X11/app-defaults
 
-Summary: An X Window System tool for drawing basic vector graphics.
+Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 4%{?dist}
-License: Xfig License (free)
+Release: 5%{?dist}
+License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
 Source0: http://www.xfig.org/xfigdist/xfig.%{version}.full.tar.gz
 Source1: xfig.png
 Source2: xfig.desktop
+Source3: xfig.sh
 
 Patch0: xfig-3.2.4-redhat.patch
 Patch1: xfig-3.2.5-fhs.patch
 Patch2: xfig-3.2.5-mkstemp.diff
 Patch7: xfig.3.2.5-modularX.patch
 Patch9: xfig.3.2.5-Xaw3d.patch
-
-Requires: transfig >= 1:3.2.5
-Requires: xdg-utils
-Requires: aspell
+Patch10: xfig-3.2.5-enable-Xaw3d.patch
+Patch11: xfig-3.2.5-color-resources.patch
+Patch12: xfig-3.2.5-quiet.patch
+Patch13: xfig-3.2.5-urwfonts.patch
 
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -33,9 +34,13 @@ BuildRequires: libXi-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
+BuildRequires: Xaw3d-devel
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires: %{name}-common = %{version}-%{release}
+Provides: %{name}-executable = %{version}-%{release}
+
 %description
 Xfig is an X Window System tool for creating basic vector graphics,
 including bezier curves, lines, rulers and more.  The resulting
@@ -46,6 +51,33 @@ PostScript, LaTeX).
 You should install xfig if you need a simple program to create vector
 graphics.
 
+
+%package Xaw3d
+Summary:        Xaw3d version of xfig
+Group:          Applications/Multimedia
+# for xrdb
+Requires:       xorg-x11-server-utils
+Requires:       %{name}-common = %{version}-%{release}
+Provides:       %{name}-executable = %{version}-%{release}
+
+%description Xaw3d
+Xaw3d version of xfig, an X Window System tool for creating basic vector
+graphics, including bezier curves, lines, rulers and more. The Xaw3d version
+is a more modern / prettier looking version of the normal xfig program, other
+then that it is identical.
+
+
+%package common
+Summary:        Common xfig files
+Group:          Applications/Multimedia
+Requires:       transfig >= 1:3.2.5, xdg-utils, aspell, urw-fonts
+# So that this will get uninstalled together with xfig / xfig-Xaw3d
+Requires:       %{name}-executable = %{version}-%{release}
+
+%description common
+Files common to both the plain Xaw and the Xaw3d version of xfig.
+
+
 %prep
 %setup -q -n xfig.%{version}
 %patch0 -p1 -b .redhat
@@ -53,21 +85,44 @@ graphics.
 %patch2 -p1 -b .mkstemp
 %patch7 -p1 -b .modularX
 %patch9 -p1 -b .Xaw3d
+%patch10 -p1 -b .no-Xaw3d
+%patch11 -p1 -b .color-resources
+%patch12 -p1 -b .quiet
+%patch13 -p1 -b .urw
+ln -nfs Doc/xfig.man xfig.man
+chmod -x `find -type f`
+rm `find Doc -name '*.orig'` Doc/html/*.save Doc/html/images/sav1a0.tmp
+sed -i 's/\r//g' Doc/html/index.html
+for i in Doc/html/{new_features,new_features.3.2.4,bugs_fixed.3.2.4}.html; do
+  iconv -f ISO-8859-1 -t UTF8 $i > $i.UTF-8
+  mv $i.UTF-8 $i
+done
+
 
 %build
+# First build the Xaw3d version
 xmkmf
-ln -nfs Doc/xfig.man xfig.man
 make XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
      CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strength-reduce -fno-strict-aliasing"
+mv xfig xfig-Xaw3d
+make distclean
+
+# And then build the normal Xaw version
+mv Imakefile.no-Xaw3d Imakefile
+xmkmf
+make XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
+     CDEBUGFLAGS="$RPM_OPT_FLAGS -fno-strength-reduce -fno-strict-aliasing"
+
 
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=%{buildroot} \
-     XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
-     XAPPLOADDIR=%{app_defaults_dir} \
-     CONFDIR=%{_datadir}/X11 \
-     install install.all
+make DESTDIR=%{buildroot} XFIGDOCDIR=%{_docdir}/%{name}-%{version} install.all
+
+# install the Xaw3d version and the wrapper for the .desktop file
+mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-plain
+install -p -m 755 %{SOURCE3} %{buildroot}%{_bindir}/%{name}
+install -m 755 %{name}-Xaw3d %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/pixmaps \
          %{buildroot}%{_datadir}/applications
@@ -75,22 +130,41 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps \
 install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
 install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/net-xfig.desktop
 
-rm -fr %{buildroot}%{_prefix}/lib*
+# remove app-defaults symlink which gets installed
+rm %{buildroot}%{_prefix}/lib*/X11/app-defaults
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-plain
+
+%files Xaw3d
+%defattr(-,root,root,-)
+%{_bindir}/%{name}-Xaw3d
+
+%files common
+%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}
-%attr(0755,root,root) %{_bindir}/*
-%{_datadir}/%{name}/*
+%{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_mandir}/*/*
 %{_datadir}/pixmaps/%{name}.png
 %{app_defaults_dir}/*
 %{_datadir}/applications/*
 
+
 %changelog
+* Fri Nov 16 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.5-5
+- Also compile a version against Xaw3d instead of plain Xaw, available in the
+  new xfig-Xaw3d package
+- Various specfile cleanups for packaging guidelines compliance
+- Remove spurious executable permissions on various files (bz 247424)
+- Apply patch fixing problems with xfig not finding fonts (bz 210278)
+
 * Thu Nov 15 2007 Than Ngo <than@redhat.com> 3.2.5-4
 - fix #201992, xfig crashes in the edit function