rpms/dvipdfmx/devel dvipdfmx-20080520-ebb-to-ebbx.patch, NONE, 1.1 dvipdfmx.spec, 1.3, 1.4

[Jonathan G. Underwood (jgu)]

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5778

Modified Files:
	dvipdfmx.spec 
Added Files:
	dvipdfmx-20080520-ebb-to-ebbx.patch 
Log Message:
* Sun May 26 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.23.20080520cvs
- Added dvipdfmx-20080520-ebb-to-ebbx.patch to rename ebb to ebbx to stop
  conflict with dvipdfm package (BZ #448347)


dvipdfmx-20080520-ebb-to-ebbx.patch:

--- NEW FILE dvipdfmx-20080520-ebb-to-ebbx.patch ---
diff -up dvipdfmx-20080520/src/dvipdfmx.c.ebb-to-ebbx dvipdfmx-20080520/src/dvipdfmx.c
--- dvipdfmx-20080520/src/dvipdfmx.c.ebb-to-ebbx	2008-05-26 13:08:34.000000000 +0100
+++ dvipdfmx-20080520/src/dvipdfmx.c	2008-05-26 13:28:13.000000000 +0100
@@ -774,7 +774,7 @@ main (int argc, char *argv[]) 
 {
   double dvi2pts;
 
-  if (strcmp(argv[0], "ebb") == 0)
+  if (strcmp(argv[0], "ebbx") == 0)
     return extractbb(argc, argv, EBB_OUTPUT);
   else if (strcmp(argv[0], "xbb") == 0 || strcmp(argv[0], "extractbb") == 0)
     return extractbb(argc, argv, XBB_OUTPUT);
diff -up dvipdfmx-20080520/src/Makefile.in.ebb-to-ebbx dvipdfmx-20080520/src/Makefile.in
--- dvipdfmx-20080520/src/Makefile.in.ebb-to-ebbx	2008-05-18 01:18:54.000000000 +0100
+++ dvipdfmx-20080520/src/Makefile.in	2008-05-26 13:27:54.000000000 +0100
@@ -266,7 +266,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  else :; fi; \
 	done
 	cd "$(DESTDIR)$(bindir)" && rm -f xbb && $(LN_S) dvipdfmx xbb
-	cd "$(DESTDIR)$(bindir)" && rm -f ebb && $(LN_S) dvipdfmx ebb
+	cd "$(DESTDIR)$(bindir)" && rm -f ebbx && $(LN_S) dvipdfmx ebbx
 	cd "$(DESTDIR)$(bindir)" && rm -f extractbb && $(LN_S) dvipdfmx extractbb
 
 
@@ -277,7 +277,7 @@ uninstall-binPROGRAMS:
 	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
-	cd "$(DESTDIR)$(bindir)" && rm -f xbb ebb extractbb
+	cd "$(DESTDIR)$(bindir)" && rm -f xbb ebbx extractbb
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)


Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/devel/dvipdfmx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dvipdfmx.spec	20 May 2008 23:14:45 -0000	1.3
+++ dvipdfmx.spec	26 May 2008 12:53:52 -0000	1.4
@@ -9,13 +9,20 @@
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.22.%{snapshot}cvs%{?dist}
+Release:        0.23.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://project.ktug.or.kr/dvipdfmx/
 Source0:        http://project.ktug.or.kr/dvipdfmx/snapshot/current/%{name}-%{snapshot}.tar.gz
+
+# This patch renames ebb to ebbx to prevent conflict with the ebb from the
+# dvipdfm package. 
+# htps://bugzilla.redhat.com/show_bug.cgi?id=448347
+# Reported to upstream on 26th May 2008 via email
+Patch0:		dvipdfmx-20080520-ebb-to-ebbx.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kpathsea-devel libpng-devel zlib-devel libpaper-devel texlive-texmf
@@ -38,7 +45,7 @@
 
 %prep
 %setup -q -n %{name}-%{snapshot}
-
+%patch0 -p1 -b .ebb-to-ebbx
 
 %build
 %configure
@@ -80,7 +87,7 @@
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/dvipdfmx
 %{_bindir}/xbb
-%{_bindir}/ebb
+%{_bindir}/ebbx
 %{_bindir}/extractbb
 %dir %{_texmf_conf}/dvipdfmx/
 %config(noreplace) %{_texmf_conf}/dvipdfmx/cid-x.map
@@ -94,6 +101,10 @@
 
 
 %changelog
+* Sun May 26 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.23.20080520cvs
+- Added dvipdfmx-20080520-ebb-to-ebbx.patch to rename ebb to ebbx to stop
+  conflict with dvipdfm package (BZ #448347)
+
 * Tue May 20 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.22.20080520cvs
 - Bump release to fix broken CVS tag
 - Correct email address in spec file changelog