rpms/dvipdfmx/F-11 dvipdfmx-20090708-ebb-to-ebbx.patch, NONE, 1.1 dvipdfmx.spec, 1.10, 1.11

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/dvipdfmx/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19488

Modified Files:
	dvipdfmx.spec 
Added Files:
	dvipdfmx-20090708-ebb-to-ebbx.patch 
Log Message:
* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.30.20090708cvs
- Add dvipdfmx-20090708-ebb-to-ebbx.patch to rename ebb to ebbx to avoid file
  conflict with ebb package


dvipdfmx-20090708-ebb-to-ebbx.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 dvipdfmx.c  |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE dvipdfmx-20090708-ebb-to-ebbx.patch ---
diff -up dvipdfmx-20090708/src/dvipdfmx.c.ebb-to-ebbx dvipdfmx-20090708/src/dvipdfmx.c
--- dvipdfmx-20090708/src/dvipdfmx.c.ebb-to-ebbx	2009-09-15 13:48:07.071988198 +0100
+++ dvipdfmx-20090708/src/dvipdfmx.c	2009-09-15 13:48:29.232050928 +0100
@@ -807,11 +807,11 @@ main (int argc, char *argv[]) 
   {
     const char *base = xbasename(argv[0]);
 
-    if (!(strcmp(base, "dvipdfm") && strcmp(base, "ebb")))
+    if (!(strcmp(base, "dvipdfm") && strcmp(base, "ebbx")))
       compat_mode = 1;
 
     if (!(strcmp(base, "extractbb") && strcmp(base, "xbb") &&
-	  strcmp(base, "ebb")))
+	  strcmp(base, "ebbx")))
       return extractbb(argc, argv);
   }
 
diff -up dvipdfmx-20090708/src/Makefile.am.ebb-to-ebbx dvipdfmx-20090708/src/Makefile.am
--- dvipdfmx-20090708/src/Makefile.am.ebb-to-ebbx	2009-09-15 13:49:26.639987749 +0100
+++ dvipdfmx-20090708/src/Makefile.am	2009-09-15 13:50:27.855050812 +0100
@@ -39,5 +39,5 @@ dvipdfmx_DEPENDENCIES = $(ZLIBDEP) $(LIB
 dvipdfmx_LDFLAGS = @dvipdfmx_LDFLAGS@
 
 install-exec-hook:
-	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
diff -up dvipdfmx-20090708/src/Makefile.in.ebb-to-ebbx dvipdfmx-20090708/src/Makefile.in
--- dvipdfmx-20090708/src/Makefile.in.ebb-to-ebbx	2009-09-15 13:49:32.351988463 +0100
+++ dvipdfmx-20090708/src/Makefile.in	2009-09-15 13:50:21.122050455 +0100
@@ -1517,7 +1517,7 @@ uninstall-am: uninstall-binPROGRAMS
 
 
 install-exec-hook:
-	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
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


Index: dvipdfmx.spec
===================================================================
RCS file: /cvs/extras/rpms/dvipdfmx/F-11/dvipdfmx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- dvipdfmx.spec	15 Sep 2009 11:43:43 -0000	1.10
+++ dvipdfmx.spec	15 Sep 2009 13:19:13 -0000	1.11
@@ -10,7 +10,7 @@
 
 Name:           dvipdfmx
 Version:        0
-Release:        0.29.%{snapshot}cvs%{?dist}
+Release:        0.30.%{snapshot}cvs%{?dist}
 Summary:        A DVI to PDF translator
 
 Group:          Applications/Publishing
@@ -18,6 +18,10 @@ License:        GPLv2+
 URL:            http://project.ktug.or.kr/dvipdfmx/
 Source0:        http://project.ktug.or.kr/dvipdfmx/snapshot/current/%{name}-%{snapshot}.tar.gz
 
+# This patch not accepted upstream, but is to avoid a filename conflict with
+# ebb from the dvipdfm package. Long term we should just drop the dvipdfm package.
+Patch0:	       dvipdfmx-20090708-ebb-to-ebbx.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kpathsea-devel libpng-devel zlib-devel libpaper-devel texlive-texmf
@@ -40,6 +44,7 @@ Hirata and its modified one, dvipdfm-kor
 
 %prep
 %setup -q -n %{name}-%{snapshot}
+%patch0 -p1 -b ebb-to-ebbx
 
 %build
 %configure
@@ -81,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/dvipdfmx
 %{_bindir}/extractbb
-%{_bindir}/ebb
+%{_bindir}/ebbx
 %dir %{_texmf_conf}/dvipdfmx/
 %config(noreplace) %{_texmf_conf}/dvipdfmx/cid-x.map
 %{_texmf_main}/dvipdfmx
@@ -92,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.30.20090708cvs
+- Add dvipdfmx-20090708-ebb-to-ebbx.patch to rename ebb to ebbx to avoid file
+  conflict with ebb package
+
 * Mon Sep 15 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 0-0.29.20090708cvs
 - Fix up errors in file list