Hello community, here is the log from the commit of package transfig checked in at Mon Jul 31 23:27:45 CEST 2006. -------- --- transfig/transfig.changes 2006-01-25 21:42:16.000000000 +0100 +++ transfig/transfig.changes 2006-07-31 19:17:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 31 19:17:02 CEST 2006 - werner@suse.de + +- Make it build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ transfig.spec ++++++ --- /var/tmp/diff_new_pack.mk5Q4y/_old 2006-07-31 23:27:37.000000000 +0200 +++ /var/tmp/diff_new_pack.mk5Q4y/_new 2006-07-31 23:27:37.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package transfig (Version 3.2.4) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -18,11 +18,21 @@ Requires: netpbm Autoreqprov: on Version: 3.2.4 -Release: 65 +Release: 80 Summary: Graphic Converter Source: transfig.%{version}.tar.bz2 Patch0: transfig.%{version}.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" + +%global _mandir %{_exec_prefix}/man +%define _x11data %{_exec_prefix}/lib/X11 +%define _data $(LIBDIR) +%else +%define _x11data %{_datadir}/X11 +%define _data $(SHAREDIR) +%endif %description TransFig is a set of tools for creating TeX documents with graphics @@ -49,7 +59,7 @@ %prep %setup -q -n transfig.%{version} %patch -xmkmf -a +xmkmf -a -D_DATA='%{_data}' %build make CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w" @@ -57,36 +67,34 @@ rm -f doc/manual/*.{log,toc,div} %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xfig/fig2dev -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xfig/bitmaps -make DESTDIR=$RPM_BUILD_ROOT install CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w" -make DESTDIR=$RPM_BUILD_ROOT install.man CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w" -mkdir -p $RPM_BUILD_ROOT%{_docdir}/transfig/manual -install -m 644 [CLNR]* $RPM_BUILD_ROOT%{_docdir}/transfig/ -install -m 644 doc/manual/* $RPM_BUILD_ROOT%{_docdir}/transfig/manual/ - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_x11data}/xfig/fig2dev +mkdir -p %{buildroot}%{_x11data}/xfig/bitmaps +make DESTDIR=%{buildroot} install CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w" +make DESTDIR=%{buildroot} install.man CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w" +mkdir -p %{buildroot}%{_docdir}/transfig/manual +install -m 644 [CLNR]* %{buildroot}%{_docdir}/transfig/ +install -m 644 doc/manual/* %{buildroot}%{_docdir}/transfig/manual/ %files %defattr(-,root,root) -/usr/X11R6/bin/fig2dev -/usr/X11R6/bin/fig2ps2tex -/usr/X11R6/bin/fig2ps2tex.sh -/usr/X11R6/bin/pic2tpic -/usr/X11R6/bin/transfig -%dir /usr/X11R6/lib/X11/xfig -/usr/X11R6/lib/X11/xfig/fig2dev/ -/usr/X11R6/lib/X11/xfig/bitmaps/ -%doc /usr/X11R6/man/man1/fig2dev.1x.gz -%doc /usr/X11R6/man/man1/fig2ps2tex.1x.gz -%doc /usr/X11R6/man/man1/pic2tpic.1x.gz -%doc /usr/X11R6/man/man1/transfig.1x.gz +%{_bindir}/fig2dev +%{_bindir}/fig2ps2tex +%{_bindir}/fig2ps2tex.sh +%{_bindir}/pic2tpic +%{_bindir}/transfig +%dir %{_x11data}/xfig +%{_x11data}/xfig/fig2dev/ +%{_x11data}/xfig/bitmaps/ +%doc %{_mandir}/man1/fig2dev.1x.gz +%doc %{_mandir}/man1/fig2ps2tex.1x.gz +%doc %{_mandir}/man1/pic2tpic.1x.gz +%doc %{_mandir}/man1/transfig.1x.gz %doc %{_docdir}/transfig/ %changelog -n transfig +* Mon Jul 31 2006 - werner@suse.de +- Make it build with X11R7 * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Mon Feb 28 2005 - meissner@suse.de ++++++ transfig.3.2.4.dif ++++++ --- /var/tmp/diff_new_pack.mk5Q4y/_old 2006-07-31 23:27:37.000000000 +0200 +++ /var/tmp/diff_new_pack.mk5Q4y/_new 2006-07-31 23:27:37.000000000 +0200 @@ -1,5 +1,5 @@ --- Imakefile -+++ Imakefile 2004-02-03 18:18:19.000000000 +0100 ++++ Imakefile 2006-07-31 19:14:30.000000000 +0200 @@ -1,7 +1,3 @@ -#ifndef XCOMM -#define XCOMM # @@ -8,8 +8,16 @@ XCOMM Top level Makefile for TransFig XCOMM TransFig: Facility for Translating Fig code +@@ -24,6 +20,7 @@ XCOMM type "xmkmf", "make Makefiles", "m + #define IHaveSubdirs + #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' + ++MFLAGS = XFIGLIBDIR=_DATA/xfig + DEPLIBS = + SUBDIRS = fig2dev transfig + MakeSubdirs($(SUBDIRS)) --- doc/manual/Makefile -+++ doc/manual/Makefile 2004-02-03 18:18:19.000000000 +0100 ++++ doc/manual/Makefile 2006-07-31 18:26:56.000000000 +0200 @@ -2,7 +2,7 @@ # TransFig makefile # @@ -19,7 +27,7 @@ # translation into latex -@@ -11,3 +11,8 @@ +@@ -11,3 +11,8 @@ trans.tex: trans.fig Makefile clean:: rm -f trans.tex @@ -29,13 +37,13 @@ +manual.dvi: manual.tex trans.tex + latex manual.tex; latex manual.tex; latex manual.tex --- fig2dev/Imakefile -+++ fig2dev/Imakefile 2004-02-03 18:18:19.000000000 +0100 -@@ -20,13 +20,13 @@ ++++ fig2dev/Imakefile 2006-07-31 19:08:56.000000000 +0200 +@@ -20,13 +20,13 @@ XCOMM ****** XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled XCOMM and installed xfig. -XFIGLIBDIR = /usr/local/lib/X11/xfig -+XFIGLIBDIR = $(LIBDIR)/xfig ++XFIGLIBDIR = $(LIBDIR)/xfig XCOMM ****** XCOMM If your system has the strerror() function (doesn't have sys_errlist) then @@ -46,7 +54,7 @@ XCOMM The following probably only applies to Windows 9x/NT: XCOMM If your system can open files in text and binary modes and has the -@@ -39,7 +39,7 @@ +@@ -39,7 +39,7 @@ XCOMM Uncomment the following line if yo XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures @@ -55,7 +63,7 @@ XCOMM **************** XCOMM Change RGB if necessary, to point to your rgb.txt color database -@@ -73,7 +73,7 @@ +@@ -73,7 +73,7 @@ XCOMM Change XPMLIBDIR if necessary to p XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) XCOMM @@ -64,7 +72,7 @@ #ifdef USEXPM XPMLIBDIR = $(USRLIBDIR) -@@ -82,11 +82,11 @@ +@@ -82,11 +82,11 @@ XPMINC = -I/usr/include/X11 XCOMM **************** XCOMM Uncomment the following to set default paper size to A4 @@ -78,7 +86,7 @@ XCOMM **************** XCOMM Comment out the DDNFSS = ... line if you don't want NFSS2 font selection -@@ -102,6 +102,7 @@ +@@ -102,6 +102,7 @@ XCOMM probably want to include neither. DDNFSS = -DNFSS DDLATEX2E_GRAPHICS = -DLATEX2E_GRAPHICS @@ -86,7 +94,7 @@ XCOMM DDEPSFIG = -DEPSFIG XCOMM **************** -@@ -126,23 +127,23 @@ +@@ -126,23 +127,23 @@ XCOMM Comment out the next line if you h #ifdef I18N I18N_DEFS = -DI18N @@ -114,7 +122,7 @@ ( cd $(DESTDIR)$(FIG2DEV_LIBDIR); \ rm -f hr_HR.ps hu_HU.ps pl_PL.ps ro_RO.ps sk_SK.ps sl_SI.ps; \ $(LN) cs_CZ.ps hr_HR.ps; $(LN) cs_CZ.ps hu_HU.ps; \ -@@ -154,7 +155,7 @@ +@@ -154,7 +155,7 @@ XCOMM ********************************** XCOMM *** You shouldn't have to change anything below this point *** XCOMM ************************************************************** @@ -123,7 +131,7 @@ #ifdef USEPNG DUSEPNG = -DUSE_PNG -@@ -233,7 +234,7 @@ +@@ -233,7 +234,7 @@ install:: else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \ echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \ for f in * ; do \ @@ -133,7 +141,7 @@ install.all:: --- fig2dev/fig2dev.c -+++ fig2dev/fig2dev.c 2004-02-03 18:18:19.000000000 +0100 ++++ fig2dev/fig2dev.c 2006-07-31 18:26:56.000000000 +0200 @@ -24,14 +24,20 @@ #include <sys/types.h> #endif @@ -155,7 +163,7 @@ char lang[40]; int parse_gridspec(); -@@ -345,6 +351,7 @@ +@@ -345,6 +351,7 @@ char *argv[]; F_compound objects; int status; @@ -164,7 +172,7 @@ setmode(1,O_BINARY); /* stdout is binary */ #endif --- fig2dev/fig2dev.h -+++ fig2dev/fig2dev.h 2004-02-03 18:18:19.000000000 +0100 ++++ fig2dev/fig2dev.h 2006-07-31 18:26:56.000000000 +0200 @@ -22,7 +22,7 @@ #include <sys/file.h> #include <signal.h> @@ -174,7 +182,7 @@ #include <pwd.h> #include <errno.h> #include <time.h> -@@ -57,7 +57,7 @@ +@@ -57,7 +57,7 @@ typedef char Boolean; #ifndef X_NOT_STDC_ENV # include <string.h> #else @@ -184,7 +192,7 @@ # else # include <strings.h> --- fig2dev/fig2ps2tex.script -+++ fig2dev/fig2ps2tex.script 2004-02-03 18:18:19.000000000 +0100 ++++ fig2dev/fig2ps2tex.script 2006-07-31 18:26:56.000000000 +0200 @@ -3,6 +3,7 @@ # Fig2ps2tex - generate a TeX file for including a PostScript file # involves calculating the bounding box from fig2ps output @@ -194,8 +202,8 @@ set xsp = `echo "3k $bbox[4] $bbox[2] - 72 / p" | dc` --- fig2dev/getopt.c -+++ fig2dev/getopt.c 2004-02-03 18:18:20.000000000 +0100 -@@ -35,6 +35,7 @@ ++++ fig2dev/getopt.c 2006-07-31 18:26:56.000000000 +0200 +@@ -35,6 +35,7 @@ static char sccsfid[] = "@(#) getopt.c 5 #define EMSG "" #define ENDARGS "--" @@ -203,7 +211,7 @@ /* this is included because index is not on some UNIX systems */ static char * index (s, c) -@@ -46,7 +47,9 @@ +@@ -46,7 +47,9 @@ index (s, c) else s++; return (NULL); } @@ -213,7 +221,7 @@ /* * get option letter from argument vector */ -@@ -94,4 +97,10 @@ +@@ -94,4 +97,10 @@ fig_getopt(nargc,nargv,ostr) } return(optopt); /* dump back option letter */ } @@ -226,7 +234,7 @@ +} +#endif --- fig2dev/dev/genps.c -+++ fig2dev/dev/genps.c 2004-02-03 18:19:22.000000000 +0100 ++++ fig2dev/dev/genps.c 2006-07-31 18:26:56.000000000 +0200 @@ -37,6 +37,8 @@ */ @@ -236,7 +244,7 @@ #include "fig2dev.h" #include "figure.h" #include "object.h" -@@ -803,23 +805,45 @@ +@@ -803,23 +805,45 @@ F_compound *objects; fprintf(tfp, "%s\n", SPLINE_PS); #ifdef I18N if (support_i18n && iso_text_exist(objects)) { @@ -289,8 +297,8 @@ if (strstr(str, "CompositeRoman")) enable_composite_font = True; fputs(str, tfp); --- fig2dev/dev/genpstex.c -+++ fig2dev/dev/genpstex.c 2004-02-03 18:18:20.000000000 +0100 -@@ -62,10 +62,13 @@ ++++ fig2dev/dev/genpstex.c 2006-07-31 18:26:56.000000000 +0200 +@@ -62,10 +62,13 @@ extern void genps_spline (), genlatex_option (), genlatex_text (), @@ -307,8 +315,8 @@ static char pstex_file[1000] = ""; --- fig2dev/dev/gensvg.c -+++ fig2dev/dev/gensvg.c 2004-02-03 18:18:20.000000000 +0100 -@@ -692,18 +692,18 @@ ++++ fig2dev/dev/gensvg.c 2006-07-31 18:26:56.000000000 +0200 +@@ -692,18 +692,18 @@ gensvg_text (t) if (t->angle != 0) { fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n", (int) (t->base_x * mag), (int) (t->base_y * mag), degrees (t->angle)); @@ -334,8 +342,8 @@ (t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)), anchor[t->type]); --- transfig/Imakefile -+++ transfig/Imakefile 2004-02-03 18:18:20.000000000 +0100 -@@ -18,7 +18,7 @@ ++++ transfig/Imakefile 2006-07-31 18:26:56.000000000 +0200 +@@ -18,7 +18,7 @@ XCOMM Uncomment the USELATEX2E flag in t XCOMM \\usepackage{} command for LaTeX2e. XCOMM The default is to use \\documentstyle{} for LaTeX209. @@ -345,7 +353,7 @@ XCOMM ******* DON'T CHANGE ANYTHIN BELOW THIS POINT ******* --- transfig/sys.c -+++ transfig/sys.c 2004-02-03 18:18:20.000000000 +0100 ++++ transfig/sys.c 2006-07-31 18:26:56.000000000 +0200 @@ -15,6 +15,8 @@ */ @@ -356,7 +364,7 @@ #define MAXSYS 10000 --- transfig/transfig.c -+++ transfig/transfig.c 2004-02-03 18:18:20.000000000 +0100 ++++ transfig/transfig.c 2006-07-31 18:26:56.000000000 +0200 @@ -25,6 +25,8 @@ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org
participants (1)
-
root＠suse.de