- fix bnc#682913: device X100 is missing

* create new groff-devx package containing all devX devices, as they need X for build - fix bnc#683857: Unicode characters in use * groff-1.20.1-deunicode.patch removes unicode.tmac from tty.tmac, so no ascii chars wil be converted to unicode OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=12
2011-04-28 14:40:40 +00:00
parent 833d7450f1
commit 2ab5a8a0dd
5 changed files with 68 additions and 19 deletions
--- a/groff-1.20.1-deunicode.patch
+++ b/groff-1.20.1-deunicode.patch
@@ -0,0 +1,15 @@
+Index: groff-1.20.1/tmac/tty.tmac
+===================================================================
+--- groff-1.20.1.orig/tmac/tty.tmac	2009-01-09 15:25:52.000000000 +0100
+++ groff-1.20.1/tmac/tty.tmac	2011-04-28 14:14:11.527228221 +0200
+@@ -64,10 +64,6 @@
+ .fchar \[Eu] EUR
+ .fchar \[.i] i
+ .fchar \[bq] ,
+-.
+-.if '\*[.T]'utf8' \
+-.  mso unicode.tmac
+-.
+ .\" color definitions
+ .defcolor black rgb #000000
+ .defcolor red rgb #ff0000
--- a/groff.changes
+++ b/groff.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 28 12:04:23 UTC 2011 - mvyskocil@suse.cz
+
+- fix bnc#682913: device X100 is missing
+  * create new groff-devx package containing all devX devices, as they
+    need X for build
+- fix bnc#683857: Unicode characters in use
+  * groff-1.20.1-deunicode.patch removes unicode.tmac from tty.tmac, so
+    no ascii chars wil be converted to unicode
+
 -------------------------------------------------------------------
 Tue Mar 15 08:34:56 UTC 2011 - mvyskocil@suse.cz

--- a/groff.spec
+++ b/groff.spec
@@ -37,6 +37,8 @@ Patch0:         groff_1.20.1-10.debian.diff
 Patch1:         groff-1.20.1-destbufferoverflow.patch
 Patch2:         groff-1.20.1-nroff-empty-LANGUAGE.patch
 Patch3:         groff-1.20.1-groffer-libexecdir.patch
+Patch4:         groff-1.20.1-deunicode.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 BuildRequires:  bison
@@ -62,10 +64,6 @@ PostScript(tm) format for printing on a PostScript(tm) printer. Most
 programs store their man pages in either /usr/share/man/ or
 /usr/X11R6/man/.

-Authors:
--------
-    James Clark	<jjc@clark.com>
-
 %package doc
 License:        BSD3c(or similar) ; GPLv2+
 Group:          Productivity/Publishing/Troff
@@ -81,16 +79,13 @@ PostScript(tm) format for printing on a PostScript(tm) printer. Most
 programs store their man pages in either /usr/share/man/ or
 /usr/X11R6/man/.

-Authors:
--------
-    James Clark	<jjc@clark.com>
-
 %prep
 %setup -q -n groff-%{version} 
 %patch0 -p1 -b .debian
 %patch1
 %patch2 -p1 -b .bnc540600
 %patch3 -p1 -b .groffer-libexecdir
+%patch4 -p1 -b .deunicode

 %build
 PATH=$PWD/src/roff/troff:$PWD/src/preproc/pic:$PWD/src/preproc/eqn:$PWD/src/preproc/tbl:$PWDsrc/preproc/refer:$PWD/src/preproc/soelim:$PATH
@@ -113,6 +108,7 @@ popd

 %install
 %{makeinstall} docdir=%{_defaultdocdir}/%{name}
+
 %{__rm} -f %{buildroot}%{_infodir}/dir

 # documentation
@@ -162,8 +158,6 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/profile.d/zzz-%{name}.*sh
 %{_datadir}/%{name}
 %{_libexecdir}/%{name}
-#%verify(not md5) /usr/share/groff/1.18.1/tmac/mm/locale
-#%verify(not md5) /usr/share/groff/1.18.1/tmac/mm/se_locale
 /sbin/conf.d/SuSEconfig.%{name}
 %{_localstatedir}/adm/fillup-templates/sysconfig.suseconfig-%{name}

--- a/gxditview.changes
+++ b/gxditview.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 28 12:04:23 UTC 2011 - mvyskocil@suse.cz
+
+- fix bnc#682913: device X100 is missing
+  * create new groff-devx package containing all devX devices, as they
+    need X for build
+- fix bnc#683857: Unicode characters in use
+  * groff-1.20.1-deunicode.patch removes unicode.tmac from tty.tmac, so
+    no ascii chars wil be converted to unicode
+
 -------------------------------------------------------------------
 Wed Oct  6 12:41:24 UTC 2010 - mvyskocil@suse.cz

--- a/gxditview.spec
+++ b/gxditview.spec
@@ -30,6 +30,8 @@ Patch0:         groff_1.20.1-10.debian.diff
 Patch1:         groff-1.20.1-destbufferoverflow.patch
 Patch2:         groff-1.20.1-nroff-empty-LANGUAGE.patch
 Patch3:         groff-1.20.1-groffer-libexecdir.patch
+Patch4:         groff-1.20.1-deunicode.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 BuildRequires:  xorg-x11-devel
@@ -43,11 +45,16 @@ This version of xditview is called gxditview and has some extensions
 used by the groff command.  gxditview is used by groff if called with
 the -X option.

+%package -n groff-devx
+License:        BSD3c(or similar) ; GPLv2+
+Group:          Productivity/Publishing/Troff
+Summary:        X output devices for groff
+Requires:       groff
+Supplements:    groff

-
-Authors:
--------
-    James Clark     <jjc@clark.com>
+%description -n groff-devx
+The output devices X75, X75-12, devX100 and devX100-12 for groff. They are in
+separate package because of bootstrapping issues.

 %prep
 %setup -q -n groff-%{version} 
@@ -55,11 +62,9 @@ Authors:
 %patch1 -p0 -b .destbufferoverflow
 %patch2 -p1 -b .bnc540600
 %patch3 -p1 -b .groffer-libexecdir
+%patch4 -p1 -b .deunicode

 %build
-# remove empty backups
-rm -f ChangeLog.jp.debian README.jp.debian
-#
 PATH=$PWD/src/roff/troff:$PWD/src/preproc/pic:$PWD/src/preproc/eqn:$PWD/src/preproc/tbl:$PWDsrc/preproc/refer:$PWD/src/preproc/soelim:$PATH
 PATH=$PWD/src/roff/grog:$PWD/src/roff/groff:$PWD/src/devices/grops:$PWD/src/devices/grotty:$PWD/src/devices/grodvi:$PWD/src/devices/grohtml:$PATH
 GROFF_COMMAND_PREFIX=
@@ -72,10 +77,18 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fn
 %{__make}

 %install
+
+
+make DESTDIR=%{?buildroot:%{buildroot}} do=do_install font/devX*
+
+#remove unwanted stuff
+rm -rf %{buildroot}/%{_bindir}
+rm -rf %{buildroot}/%{_mandir}
+
 %{__install} -d -m 0755 %{buildroot}%{_bindir}
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/X11/app-defaults
 %{__install} -d -m 0755 %{buildroot}%{_mandir}/man1/
-
+ 
 pushd src/devices/xditview/
 %{__install} -m 0755 %{name} %{buildroot}%{_bindir}
 %{__install} -m 0644 GXditview.ad %{buildroot}%{_datadir}/X11/app-defaults/GXditview
@@ -87,9 +100,16 @@ popd

 %files
 %defattr(-,root,root)
-%doc src/devices/xditview/ChangeLog src/devices/xditview/README src/devices/xditview/TODO
+%doc src/devices/xditview/ChangeLog
+%doc src/devices/xditview/README
+%doc src/devices/xditview/TODO
+%doc 
 %{_bindir}/%{name}
 %doc %{_mandir}/man1/%{name}.1*
 %config %{_datadir}/X11/app-defaults/GXditview

+%files -n groff-devx
+%defattr(-,root,root)
+%{_datadir}/groff
+
 %changelog