[rpms/xfig] epel10.2: Name binaries correctly

[rpms/xfig] epel10.2: Name binaries correctly

[Michal Srb]

            A new commit has been pushed.

            Repo   : rpms/xfig
            Branch : epel10.2
            Commit : 21405512926d00945188d687d38cc078f0c701c9
            Author : Michal Srb <msrb@redhat.com>
            Date   : 2014-01-06T13:07:51+01:00
            Stats  : +11/-8 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/xfig/c/21405512926d00945188d687d38cc078f0c701c9?branch=epel10.2

            Log:
            Name binaries correctly

Xaw3d version has fancy 3D buttons

---
diff --git a/xfig.spec b/xfig.spec
index 8a73879..719c141 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 40.c%{?dist}
+Release: 41.c%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -106,16 +106,16 @@ chmod -x `find -type f`
 # First build the normal Xaw version
 xmkmf
 # make sure cmdline option parsing still works despite us renaming the binary
-sed -i 's/"xfig"/"xfig-Xaw3d"/' main.c
+sed -i 's/"xfig"/"xfig-plain"/' main.c
 make CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing"
-mv xfig xfig-Xaw3d
+mv xfig xfig-plain
 make distclean
 
-# And then build the plain version
+# And then build the Xaw3d version
 mv Imakefile.with-Xaw3d Imakefile
 xmkmf
 # make sure cmdline option parsing still works despite us renaming the binary
-sed -i 's/"xfig-Xaw3d"/"xfig-plain"/' main.c
+sed -i 's/"xfig-plain"/"xfig-Xaw3d"/' main.c
 make CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing"
 
 
@@ -129,10 +129,10 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Libraries/Maps/{USA,Canada}/assemble
 # remove app-defaults symlink which gets installed
 rm $RPM_BUILD_ROOT%{_prefix}/lib*/X11/app-defaults
 
-# install the Xaw3d version and the wrapper for the .desktop file
-mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-plain
+# install both Xaw and Xaw3d versions and the wrapper for the .desktop file
+mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-Xaw3d
 install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -m 755 %{name}-Xaw3d $RPM_BUILD_ROOT%{_bindir}
+install -m 755 %{name}-plain $RPM_BUILD_ROOT%{_bindir}
 
 install -D -p -m 644 %{name}16x16.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
@@ -178,6 +178,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Jan 06 2014 Michal Srb <msrb@redhat.com> - 3.2.5-41.c
+- Name binaries correctly
+
 * Mon Jan 06 2014 Michal Srb <msrb@redhat.com> - 3.2.5-40.c
 - Use fprintf in safe manner