Browse Source

2015-04-05 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* cadaver, freetds, iverlog: rebuilt
	* tgif: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9492 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 7 years ago
parent
commit
3092d6772d
4 changed files with 121 additions and 67 deletions
  1. 8 5
      c/cadaver/cadaver-vl.spec
  2. 6 3
      f/freetds/freetds-vl.spec
  3. 4 1
      i/iverilog/iverilog-vl.spec
  4. 103 58
      t/tgif/tgif-vl.spec

+ 8 - 5
c/cadaver/cadaver-vl.spec

@@ -2,7 +2,7 @@ Summary: A command-line WebDAV client
 Summary(ja): コマンドライン形式の WebDAV クライアント
 Name: cadaver
 Version: 0.23.3
-Release: 2%{_dist_release}
+Release: 3%{_dist_release}
 
 Group: Applications/Internet
 License: GPLv2+
@@ -27,10 +27,10 @@ download, on-screen display, namespace operations (move/copy),
 collection creation and deletion, and locking operations.
 
 %description -l ja
-cadaver はコマンドラインの WebDAV クライアントです。ファイル
+cadaver はコマンドライン形式の WebDAV クライアントです。ファイル
 アップロード、ダウンロード、表示画面( on-screen display )、
-名前空間での操作( move/copy )、コレクションの作成や削除、ロッ
-処理をサポートします。
+名前空間での操作( move/copy )、コレクションの作成や削除、ロッ
+処理をサポートします。
 
 %prep
 %setup -q
@@ -57,11 +57,14 @@ rm -fr %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc BUGS ChangeLog COPYING FAQ INSTALL INTEROP NEWS README THANKS TODO
+%doc BUGS ChangeLog COPYING FAQ INTEROP NEWS README THANKS TODO
 %{_bindir}/cadaver
 %{_mandir}/man1/cadaver.1*
 
 %changelog
+* Sun Apr  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.23.3-3
+- rebuilt with readline 6.3
+
 * Fri Dec 26 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.23.3-2
 - rebuilt on current VineSeed
 - fixed spec to built with neon 0.30

+ 6 - 3
f/freetds/freetds-vl.spec

@@ -9,7 +9,7 @@
 Name: freetds
 Summary: Implementation of the TDS (Tabular DataStream) protocol
 Version: 0.91.103
-Release: 16%{?_dist_release}
+Release: 17%{?_dist_release}
 
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
@@ -41,6 +41,7 @@ level interfaces for DB-Lib, CT-Lib, and ODBC.
 
 %package devel
 Summary: Header files and development libraries for %{name}
+Summary(ja): %{name} のヘッダファイル及び開発用ライブラリ
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -49,9 +50,9 @@ This package contains the header files and development libraries
 for %{name}. If you like to develop programs using %{name}, you will need
 to install %{name}-devel.
 
-
 %package doc
 Summary: Development documentation for %{name}
+Summary(ha): %{name} の開発用ドキュメント
 Group: Documentation
 BuildArch: noarch
 
@@ -62,7 +63,6 @@ If you like to develop programs using %{name}, you will need to install
 
 
 %prep 
-#setup -q -n freetds-freetds
 %setup -q
 %patch1 -p1
 
@@ -147,6 +147,9 @@ rm -rf $RPM_BUILD_ROOT
  
 
 %changelog
+* Sun Apr  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.91.103-17
+- rebuilt with readline 6.3
+
 * Tue Jan 13 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.91.103-16
 - Initial build for Vine Linux
 - source as 0.91.103

+ 4 - 1
i/iverilog/iverilog-vl.spec

@@ -15,7 +15,7 @@
 
 Name:        iverilog
 Version:     0.9.7
-Release:     1%{?_dist_release}
+Release:     2%{?_dist_release}
 Summary:     A Verilog simulation and synthesis tool
 
 Group:       Applications/Engineering
@@ -108,6 +108,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Apr  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.9.7-2
+- rebuilt with readline 6.3
+
 * Sun Feb  1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.9.7-1
 - updated to 0.9.7
 - built on current VineSeed

+ 103 - 58
t/tgif/tgif-vl.spec

@@ -1,37 +1,46 @@
-Summary: 2-D drawling tool
-Summary(ja): 2次元ドローイングソフト
-Name: tgif
-%define eversion 4.2.2
-Version: %{eversion}
-Release: 1%{?_dist_release}
-
-Source0: ftp://bourbon.cs.umd.edu/pub/tgif/tgif-QPL-%{eversion}.tar.gz
-Source1: Tgif.ad.ja
-Source2: tgif-4.1.45.ja.po
-Source3: tgif.desktop
-Source4: tgif.png
+%define eversion 4.2.5
+
+Name:		tgif
+Version:	4.2.5
+Release:	1%{?_dist_release}
+Summary:	2-D drawing tool
+Summary(ja):	2次元ドローイングソフト
+
+Group:		Applications/Multimedia
+License:	QPL
+URL:		http://bourbon.usc.edu/tgif/
+
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-QPL-%{version}.tar.gz
+Source1:	Tgif.ad.ja
+Source2: 	tgif-4.1.45.ja.po
+Source3: 	tgif.desktop
 
 # http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/
-Patch10: tgif-textcursor-a-urasim.patch
-Patch101: tgif-QPL-4.1.45-size-debug.patch
-
-URL: http://bourbon.usc.edu/tgif/
-License: QPL
-Group: Applications/Multimedia
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: imake
-BuildRequires: gettext, desktop-file-utils
-BuildRequires: libXmu-devel
-Requires(post): desktop-file-utils
+Patch10:	tgif-textcursor-a-urasim.patch
+# http://ayapin-film.sakura.ne.jp/Tgif/utf8.html
+Patch20:	tgif-utf8conv2euc.patch
+# Check below later
+Patch101:	tgif-QPL-4.1.45-size-debug.patch
+Patch102:	tgif-QPL-4.2.5-format-security.patch
+
+Buildroot: 	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	imake
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+BuildRequires:	libXmu-devel
+BuildRequires:	libidn-devel
+BuildRequires:	zlib-devel
+Requires: 	ghostscript
+Requires: 	netpbm-progs
+Requires: 	xorg-x11-fonts-75dpi
+Requires: 	xorg-x11-fonts-ISO8859-1-75dpi
+Requires: 	xorg-x11-jpfonts
+Requires: 	sudo 
+Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
-Requires: ghostscript
-Requires: netpbm-progs
-Requires: xorg-x11-fonts-75dpi
-Requires: xorg-x11-fonts-ISO8859-1-75dpi
-Requires: xorg-x11-jpfonts
 
-Vendor: Project Vine
-Distribution: Vine Linux
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
 %description
 tgif  -  Xlib based interactive 2-D drawing facility under
@@ -41,36 +50,56 @@ hyper-graphics (or hyper-structured-graphics)  browser  on
 the World-Wide-Web.
 
 %description -l ja
-X 上で動くドローイングソフト tgif です. EPS, PostScript, X11 bitmap 
-形式等で出力できます. kinput2 や xwnmo を使えば日本語を入力することが
-できます. 
+Tgif は X 上で動くドローイングソフトです. EPS, PostScript, X11 bitmap 
+形式等で出力できます. 
+#'
 
 %prep
-rm -rf ${RPM_BUILD_ROOT}
 %setup -q -n %{name}-QPL-%{eversion}
-%patch10 -p0 -b textcursor
-#%patch101 -p1 -b .size
+# Upstream says the below is wrong, for now dropping
+#%%patch10 -p0 -b textcursor
+%patch20 -p0 -b .utf8conv2euc
+# Check later
+#%%patch101 -p1 -b .size
+%patch102 -p1 -b .format
 
 rm -f po/ja/ja.po
 cp %{SOURCE2} po/ja/ja.po
 
 cp -f %{SOURCE1} po/ja/Tgif.ad
 
+# Fix encoding
+sed -i -e 's|eucJP|utf8|' po/ja/tgif-wrapper.sh
+
+# Fix installation path for icon files
+sed -i.path \
+	-e '/InstallNonExec.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+	-e '/MakeDirectories.*hicolor/s|\$(TGIFDIR)|\$(DATADIR)/icons/|' \
+	Imakefile
+
 %build
-rm -rf Tgif.tmpl
-cp Tgif.tmpl-linux Tgif.tmpl
+cp -pf Tgif.tmpl-linux Tgif.tmpl
+sed -i.mode -e 's|0664|0644|' Tgif.tmpl
+
 xmkmf
-make MOREDEFINES="-DOVERTHESPOT -DUSE_XT_INITIALIZE -D_ENABLE_NLS \
-	-DPRINT_CMD=\\\"lpr\\\" -DA4PAPER" TGIFDIR=%{_datadir}/tgif \
-	LOCAL_LIBRARIES="-lXmu -lXt -lX11" tgif
+sed -i.mode -e 's|0444|0644|' Makefile
 
-(cd po
+DEFOPTS='-DOVERTHESPOT -DUSE_XT_INITIALIZE -D_ENABLE_NLS -DPRINT_CMD=\"lpr\" -DA4PAPER'
+%{__make} %{?_smp_mflags} \
+	CC="%{__cc} %{optflags}" \
+	MOREDEFINES="$DEFOPTS" \
+	TGIFDIR=%{_datadir}/tgif/ \
+	LOCAL_LIBRARIES="-lXmu -lXt -lX11" \
+	tgif
+
+pushd po
 xmkmf 
+sed -i.mode -e 's|0444|0644|' Makefile
 make Makefile LIBDIR="%{_datadir}/X11"
 make Makefiles LIBDIR="%{_datadir}/X11"
 make depend
 make all
-)
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -79,11 +108,13 @@ make DESTDIR=$RPM_BUILD_ROOT \
      TGIFDIR=%{_datadir}/tgif/ \
      DATADIR=%{_datadir} \
      MANPATH=%{_mandir} \
+     INSTALLFLAGS="-cp" \
      install \
      install.man
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}/
-%{__install} -cpm 0755 po/ja/tgif-wrapper.sh \
+# wrap tgif
+mkdir -p $RPM_BUILD_ROOT%{_bindir}/
+install -cpm 0755 po/ja/tgif-wrapper.sh \
 	$RPM_BUILD_ROOT%{_bindir}/%{name}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/tgif/*.obj
@@ -92,22 +123,22 @@ install -m 644 *.obj $RPM_BUILD_ROOT%{_datadir}/tgif
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/
 install -m 644 po/ja/Tgif.ad $RPM_BUILD_ROOT%{_datadir}/X11/ja/app-defaults/Tgif
 
-(cd po
-#install -d $RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES
-#install -m644 ja/ja.mo $RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/tgif.mo
-make DESTDIR=$RPM_BUILD_ROOT install
-)
+pushd po
+make DESTDIR=$RPM_BUILD_ROOT INSTALLFLAGS="-cp" install
+popd
+
+# desktop file
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/applications/
+
+%{find_lang} tgif
 
-# desktop file & icon
-%__mkdir_p %{buildroot}%{_datadir}/applications
-%__install -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/applications/
-%__mkdir_p %{buildroot}%{_datadir}/pixmaps
-%__install -p -m644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/tgif.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+touch --no-create %{_datadir}/icons/hicolor
 %{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 for i in vlgothic ipafont
 do
@@ -118,9 +149,13 @@ done
 
 %postun
 [ "$1" = "1" ] && exit
+touch --no-create %{_datadir}/icons/hicolor
 %{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 
-%files
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+
+%files  -f %{name}.lang
 %defattr(-,root,root)
 %doc Copyright HISTORY README* VMS_MAKE_TGIF.COM example.tex 
 %doc po/ja/README.jp License
@@ -128,12 +163,22 @@ done
 %{_libexecdir}/tgif
 %{_mandir}/man1/tgif.1x*
 %{_datadir}/tgif
-%{_datadir}/locale/*/LC_MESSAGES/tgif.mo
 %{_datadir}/X11/ja/app-defaults/Tgif
-%{_datadir}/pixmaps/*.png
+#{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Mar  4 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.2.5-1
+- updated to 4.2.5
+- updated Source1 and Source3
+- dropt Patch10 and 101
+- added Patch20 for input Japanese under utf8 environment
+
+* Sun Feb 05 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.2.2-2
+- rebuild with Vine6 environment
+- add BuildRequires: libidn-devel, zlib-devel
+
 * Sat Mar 06 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 4.2.2-1
 - new upstream release
   - all patches except textcursor-patch are merged in upstream