[Momonga-devel.ja:01091] Re: ghostscriptとgimp-print
- From: KOMATSU Shinichiro <koma2@xxxxxxxxxxxxxxxxxxxx>
- Date: Thu, 19 Dec 2002 02:48:31 +0900
小松です。
From: KOMATSU Shinichiro <koma2@xxxxxxxxxxxxxxxxxxxx>
Subject: [Momonga-devel.ja:01090] Re: ghostscriptとgimp-print
Date: Thu, Dec 19, 2002 at 02:24:34AM JST
> というわけで、ijs は ghostscript とは別パッケージにして
> gimp-print は ijs に依存するようにした方がいいでしょう。
> 分離した gs と ijs の nosrc.rpm を
>
> http://kamuy.c.u-tokyo.ac.jp/~koma2/comp/momonga/tmp/gs/
>
> 以下に置いておきましたので、コメントなどお願いします。
> 特に問題なければ明日にでも commit します。
gimp-print の nosrc.rpm も置いておきました。
あと、ghostscript と gimp-print の spec の diff を添付しておきます。
--
---------------------------------------
東京大学大学院総合文化研究科
広域科学専攻相関基礎科学系
佐々研究室 博士３年
小松 晋一朗
koma2@xxxxxxxxxxxxxxxxxxxx
koma2@xxxxxxxxxxxxxxxxx
http://kamuy.c.u-tokyo.ac.jp/~koma2/
---------------------------------------Index: ghostscript.spec
===================================================================
RCS file: /home/cvs/pkgs/ghostscript/ghostscript.spec,v
retrieving revision 1.11
diff -u -u -r1.11 ghostscript.spec
--- ghostscript.spec 2002/12/06 13:35:05 1.11
+++ ghostscript.spec 2002/12/18 17:02:29
@@ -18,7 +18,7 @@
# Omni requires libxml
BuildPreReq: libxml-devel
BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root
-Release: 1m
+Release: 1m1test
%define hpijs 1.3
%define hpijs_release %{release}
@@ -45,6 +45,7 @@
Source9: ftp://ftp.gyve.org/pub/gs-cjk/M2/gs%{cjk_ver}.tar.gz
# HP Ink Jet Server
Source10: http://prdownloads.sf.net/hpinkjet/hpijs-%{hpijs}.tar.gz
+NoSource: 10
%define gsj_ver gs550j1
Source11: %{gsj_ver}.tar.gz
# Source12 is gs6.51 friendly contrib.mak-add for gsj
@@ -474,12 +475,6 @@
EOF
%build
-# Build IJS
-cd ijs
-%configure
-make
-cd ..
-
make RPM_OPT_FLAGS="%{optflags}" prefix=%{_prefix} \
GS_LIB_DEFAULT='%{_datadir}/ghostscript/%{gs_ver}/lib:%{gs_fontpath}'
make so RPM_OPT_FLAGS="%{optflags}" prefix=%{_prefix} \
@@ -509,10 +504,6 @@
make install DESTDIR=%{buildroot}
cd ..
-cd ijs
-%makeinstall
-cd ..
-
ln -sf gs.1.gz %{buildroot}/%{_mandir}/man1/ghostscript.1.gz
ln -sf gs %{buildroot}/usr/bin/ghostscript
@@ -527,9 +518,6 @@
install -m0644 src/errors.h %{buildroot}%{_includedir}/ghostscript
install -m0644 src/gdevdsp.h %{buildroot}%{_includedir}/ghostscript
-# Don't ship ijs_client_example.
-rm -f %{buildroot}%{_bindir}/ijs_client_example
-
# The man/de/man1 symlinks are broken (bug #66238).
find %{buildroot}%{_mandir}/de/man1 -type l | xargs rm -f
@@ -564,7 +552,6 @@
%doc %{_docdir}/%{name}-%{gs_ver}
%{_libdir}/libgs.so.*
%{_libdir}/libgs.so
-%{_libdir}/libijs.so*
%files gtk
%defattr(-,root,root)
@@ -579,10 +566,6 @@
%defattr(-,root,root)
%dir %{_includedir}/ghostscript
%{_includedir}/ghostscript/*.h
-%dir %{_includedir}/ijs
-%{_includedir}/ijs/*
-%{_bindir}/ijs-config
-%{_libdir}/libijs.a
%files fonts
%defattr(-, root, root, -)
@@ -590,6 +573,11 @@
%{_datadir}/ghostscript/fonts
%changelog
+* Thu Dec 19 2002 KOMATSU Shinichiro <koma2@xxxxxxxxxxxxxxxxxxxx>
+- (7.05-1m1test)
+- separate ijs
+- make hpijs be NoSource
+
* Thu Dec 5 2002 Kazuhiko <kazuhiko@xxxxxxxxxx>
- (7.05-1m)
- import from rawhide
Index: gimp-print.spec
===================================================================
RCS file: /home/cvs/pkgs/gimp-print/gimp-print.spec,v
retrieving revision 1.3
diff -u -u -r1.3 gimp-print.spec
--- gimp-print.spec 2002/12/17 00:04:12 1.3
+++ gimp-print.spec 2002/12/18 17:46:36
@@ -1,16 +1,15 @@
-
-
Summary: A collection of high-quality printer drivers.
Name: gimp-print
Version: 4.2.4
-Release: 1m
+Release: 1m1test
License: GPL
Group: System Environment/Libraries
URL: http://gimp-print.sourceforge.net/
Source0: http://telia.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Patch0: gimp-print-4.2.1-no-kitload.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: ghostscript
+BuildRequires: ijs, ijs-devel
+BuildRequires: ncurses-devel, readline-devel
Nosource: 0
%description
@@ -40,7 +39,7 @@
%patch0 -p1 -b .no-kitload
%build
-%configure --with-foomatic --without-gimp --without-ghost
+%configure --with-foomatic --without-gimp --without-ghost --with-ijs
make CFLAGS="$RPM_OPT_FLAGS"
%install
@@ -57,15 +56,21 @@
%post
/sbin/ldconfig
-/sbin/install-info /usr/share/info/gimpprint.info.bz2 /usr/share/info/dir
+/sbin/install-info %{_infodir}/gimpprint.info %{_infodir}/dir
%postun
/sbin/ldconfig
if [ $1 = 0 ]; then
- /sbin/install-info --delete /usr/share/info/gimpprint.info.bz2 /usr/share/info/dir
+ /sbin/install-info --delete %{_infodir}/gimpprint.info %{_infodir}/dir
fi
%changelog
+* Thu Dec 19 2002 KOMATSU Shinichiro <koma2@xxxxxxxxxxxxxxxxxxxx>
+- (4.2.4-1m1test)
+- require ijs instead of ghostscript
+- add --with-ijs to configure
+- add BuildRequires: ncurses-devel, readline-devel
+
* Tue Dec 17 2002 Kazuhiko <kazuhiko@xxxxxxxxxx>
- (4.2.4-1m)