2015-03-16 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* bluefish, cups-pdf: updated
	* graphviz: rebuilt and added lua subpackage




git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9436 ec354946-7b23-47d6-9f5a-488ba84defc7

b/bluefish/bluefish-vl.spec

@@ -1,5 +1,5 @@
 Name:		bluefish
-Version:	2.2.6
+Version:	2.2.7
 Release:	1%{?_dist_release}
 Summary:	Web development application for experienced users
 Summary(ja): 	経験豊富なユーザー向けの Web 開発アプリケーション
@@ -164,6 +164,9 @@ fi
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Mar 15 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.2.7-1
+- new upstream release
+
 * Fri Nov  7 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.2.6-1
 - new upstream release
 - moved shared-data subpackage to Applications/Editors Group

c/cups-pdf/cups-pdf-vl.spec

@@ -1,67 +1,72 @@
-Summary: Extension for creating pdf-Files with CUPS
-Summary(ja): CUPS を用いた仮想 PDF プリンター
-Name: cups-pdf
-Version: 2.5.1
-Release: 1%{?_dist_release}
-Source0: http://www.cups-pdf.de/src/%{name}_%{version}.tar.gz
-Source1: INSTALL.cups-pdf
-Patch0: cups-pdf-conf-vine.patch
-Patch2: cups-pdf-desktop.patch
-Patch10: http://archive.ubuntu.com/ubuntu/pool/universe/c/cups-pdf/cups-pdf_2.5.0-4.diff.gz
-## Modified 70_cups-pdf_support-pdf-workflow.patch 
-## including cups-pdf_2.5.0-4.diff.gz
-Patch11: cups-2.5.1-70_cups-pdf_support-pdf-workflow.patch
-License: GPLv2+
-Group: Applications/Publishing
-URL: http://www.cups-pdf.de/
-
-Requires: ghostscript, cups
-#Requires: perl-MIME-tools, perl-MailTools
-BuildRequires: gcc
+Name:           cups-pdf
+Version:        2.6.1
+Release:        1%{?_dist_release}
+Summary:        Extension for creating pdf-Files with CUPS
+Summary(ja):    CUPS を用いた仮想 PDF プリンター
+
+Group:          Applications/Publishing
+URL:            http://www.cups-pdf.de/
+License:        GPLv2+
+
+Source0:        http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/%{name}_%{version}.tar.gz
+Source1:        INSTALL.cups-pdf
+Patch0:         cups-pdf-conf-vine.patch
+# Handle ${DESKTOP} from config
+Patch2:         cups-pdf-desktop.patch
+# Handle new lines in title
+Patch3:         cups-pdf-title.patch
+# Fix build warning
+Patch4:         cups-pdf-build.patch
+# Report error/success in log
+Patch5:         cups-pdf-result.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+#BuildRequires:  cups-devel
+Requires:       ghostscript, cups
+Requires(post):   cups
+Requires(postun): cups
 
 # These are the defaults paths defined in config.h
 # CUPS-PDF spool directory
-%define CPSPOOL /var/spool/cups-pdf/SPOOL
+%global CPSPOOL   %{_localstatedir}/spool/cups-pdf/SPOOL
 
 # CUPS-PDF output directory
-%define CPOUT /var/spool/cups-pdf
+%global CPOUT     %{_localstatedir}/spool/cups-pdf
 
 # CUPS-PDF log directory
-%define CPLOG /var/log/cups
+%global CPLOG     %{_localstatedir}/log/cups
 
 # CUPS-PDF cups-pdf.conf config file
-%define ETCCUPS /etc/cups
+%global ETCCUPS   %(cups-config --serverroot 2>/dev/null || echo %{_sysconfdir}/cups)
 
 # Additional path to backend directory
-%define CPBACKEND %{_libdir}/cups/backend
+%global CPBACKEND %(cups-config --serverbin  2>/dev/null || echo %{_libdir}/cups)/backend
 
 
 %description
-"cups-pdf" is a backend script for use with CUPS - 
-the "Common UNIX Printing System" (see more for CUPS under 
-http://www.cups.org/). "cups-pdf" uses the ghostscript pdfwrite
-device to produce PDF Files.
+"cups-pdf" is a backend script for use with CUPS - the "Common UNIX Printing
+System" (see more for CUPS under http://www.cups.org/). 
+"cups-pdf" uses the ghostscript pdfwrite device to produce PDF Files.
+
+This version has been modified to store the PDF files on the Desktop of the 
+user. This behavior can be changed by editing the configuration file.
 
 %description -l ja
-cups-pdf は CUPS (Common UNIX Printing System, http://www.cups.org/) 
-を用いたいわゆる仮想 PDF プリンタのためのバックエンドスクリプトです。
-cups-pdf は PDF ファイルを生成するために Ghostscript の 
-pdfwrite デバイスを使います。
+cups-pdf は CUPS (Common UNIX Printing System, http://www.cups.org/) を用いたいわゆる仮想 PDF プリンタのためのバックエンドスクリプトです。
+cups-pdf は PDF ファイルを生成するために Ghostscript の pdfwrite デバイスを使います。
 
-CUPS が動作しているときに %{name} をインストールすると、
-自動的に "CUPS-PDF Printer" として CUPS の設定を行います。
+CUPS が動作しているときに %{name} をインストールすると、自動的に "CUPS-PDF Printer" として CUPS の設定を行います。
 
 
 %prep
 %setup -n %{name}-%{version}
 %patch0 -p1 -b .vine
-%patch2 -p0
+%patch2 -p0 -b .desktop
+%patch3 -p0 -b .title
+%patch4 -p0 -b .build
+%patch5 -p0 -b .result
 
-##%patch10 -p1
-##patch -p0 -i debian/patches/60_cups-pdf_remove-contrib-SELinux-HOWTO-bashisms.patch
-##patch -p1 -i debian/patches/70_cups-pdf_support-pdf-workflow.patch
-%patch11 -p1
+cp -p %{SOURCE1} INSTALL.RPM
 
 %build
 pushd src
@@ -84,7 +89,7 @@ popd
 %__mkdir_p $RPM_BUILD_ROOT%{ETCCUPS}
 %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/cups/model/
 %__install -m644 extra/CUPS-PDF.ppd $RPM_BUILD_ROOT%{_datadir}/cups/model/
-%__install -m644 extra/cups-pdf.conf $RPM_BUILD_ROOT%{ETCCUPS}/cups-pdf.conf
+%__install -m644 extra/cups-pdf.conf $RPM_BUILD_ROOT%{ETCCUPS}/
 %__install -m755 src/cups-pdf $RPM_BUILD_ROOT%{CPBACKEND}
 
 
@@ -114,15 +119,24 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog COPYING README contrib/
+%doc ChangeLog COPYING README INSTALL.RPM contrib/
 %dir %{CPSPOOL}
 %dir %{CPOUT}
 %attr(700, root, root) %{CPBACKEND}/cups-pdf
-%{_datadir}/cups/model/CUPS-PDF.ppd
 %config(noreplace) %{ETCCUPS}/cups-pdf.conf
-
+%{_datadir}/cups/model/CUPS-PDF.ppd
 
 %changelog
+* Sun Mar 15 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.6.1-1
+- new upstream release
+- updated Patch0
+- added Patch3, 4 and 5 from Fedora
+  * Mon Sep 23 2013 Remi Collet <remi@fedoraproject.org> 2.6.1-7
+  - report success/error in log file #1010434
+  * Tue Mar 19 2013 Remi Collet <remi@fedoraproject.org> 2.6.1-4
+  - fix title detection
+  - fix build warning
+
 * Fri Feb 25 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2.5.1-1
 - new upstream release
 - fixed %%description -l ja

g/graphviz/graphviz-vl.spec

@@ -2,15 +2,24 @@ Name:           graphviz
 Summary:        Graph Visualization Tools
 Summary(ja):	グラフ可視化ツール
 Version:        2.38.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          Applications/Graphics
-License:        CPL
+License:        EPL
 URL:            http://www.graphviz.org/
 
-Source:         http://www.graphviz.org/pub/%{name}/stable/SOURCES/%{name}-%{version}.tar.gz
+Source0:	http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
+# Fix typo in testsuite (upstream ticket #2441).
+Patch0:		graphviz-2.38.0-rtest-fix.patch
+Patch1:		graphviz-2.38.0-find-fix.patch
+# Not upstream patch to fix build with OCaml > 4.02.0 (upstream) and Fedora.
+Patch2:		graphviz-2.38.0-ocaml-fix-ints.patch
+# Backported from upstream
+Patch3:		graphviz-2.38.0-format-string.patch
+# Make vimdot to work with vi (upstream ticket #2507)
+Patch4:		graphviz-2.38.0-vimdot-vi.patch
+Patch5:		graphviz-2.38.0-rbconfig.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  expat-devel
@@ -18,6 +27,7 @@ BuildRequires:  flex
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  gd-devel
+BuildRequires:  gmp-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  guile-devel
 BuildRequires:  libjpeg-turbo-devel
@@ -27,18 +37,19 @@ BuildRequires:  libtool-ltdl-devel >= 2.2.6a
 BuildRequires:	libXaw-devel
 BuildRequires:  libXext-devel
 BuildRequires:  librsvg2-devel
+BuildRequires:  lua-devel
 BuildRequires:  m4
 BuildRequires:  perl
 BuildRequires:  python-devel
 BuildRequires:  ruby-devel
 BuildRequires:  swig
-BuildRequires:  tcl >= 8.4
-BuildRequires:  tk >= 8.4
+BuildRequires:  tcl-devel >= 8.4
+BuildRequires:  tk-devel >= 8.4
 BuildRequires:  zlib-devel
 Requires:	urw-fonts
 
 # only for this release
-BuildConflicts: graphviz-devel
+# BuildConflicts: graphviz-devel
 
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -49,8 +60,8 @@ A collection of tools and tcl packages for the manipulation and layout
 of graphs (as in nodes and edges, not as in barcharts).
 
 %package devel
-Group:          Development/Libraries
 Summary:        Development tools for version %{version} of %{name}
+Group:          Development/Libraries
 Requires:       %{name} = %{version}
 
 %description devel
@@ -73,6 +84,14 @@ Requires:	%{name} = %{version}-%{release}, guile
 %description guile
 Guile extension for graphviz.
 
+%package lua
+Group:          Applications/Graphics
+Summary:	Lua extension for graphviz
+Requires:	%{name} = %{version}-%{release}, lua
+
+%description lua
+Lua extension for graphviz.
+
 %package perl
 Group:    Applications/Graphics
 Summary:  Perl extension for graphviz
@@ -92,7 +111,7 @@ Requires: python
 Python extension for graphviz.
 
 %package ruby
-Group:	  Applications/Multimedia
+Group:    Applications/Graphics
 Summary:  Ruby extension for graphviz
 Requires: %{name} = %{version}-%{release}
 Requires: ruby
@@ -112,16 +131,24 @@ Various tcl packages (extensions) for the graphviz tools.
 
 %prep
 %setup -q
+%patch0 -p1 -b .rtest-fix
+%patch1 -p1 -b .find-fix
+%patch2 -p1
+%patch3 -p1 -b .format-string
+%patch4 -p1 -b .vimdot-vi
+%patch5 -p1 -b .rbconfig
+
+%build
+autoreconf -if
 
 # using archdir instead of sitearchdir for Vine
 sed -i -e "s|sitearchdir|archdir|g" config/config_ruby.rb
-
-%build
-# Rewrite config_ruby.rb to work with Ruby 1.9
-sed -i 's|expand(|expand(Config::|' config/config_ruby.rb
+# Rewrite config_ruby.rb to work with Ruby 2.1
+sed -i 's|expand(|expand(RbConfig::|' config/config_ruby.rb
 sed -i 's|sitearchdir|vendorarchdir|' config/config_ruby.rb
-export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbConfig::CONFIG['sitearch'])" || echo /dev/null`
 
+# get the path to search for ruby/config.h to CPPFLAGS, so that configure can find it
+export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbConfig::CONFIG['sitearch'])" || echo /dev/null`
 # XXX ix86 only used to have -ffast-math, let's use everywhere
 %{expand: %%define optflags %{optflags} -ffast-math}
 
@@ -134,17 +161,18 @@ export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbCon
     --with-gdk-pixbuf \
     --without-mylibgd \
     --without-ming \
+    --without-qt \
     --disable-sharp \
     --enable-guile \
-    --enable-io \
     --disable-java \
-    --disable-lua \
+    --enable-lua \
     --disable-ocaml \
     --enable-perl \
     --disable-php \
     --enable-python \
     --disable-r \
     --enable-ruby \
+    --enable-swig \
     --enable-tcl
 
 make %{?_smp_mflags} 
@@ -209,6 +237,12 @@ fi
 %{_libdir}/graphviz/guile/
 %{_mandir}/man3/gv.3guile*
 
+%files lua
+%defattr(-,root,root,-)
+%{_libdir}/graphviz/lua/
+%{_libdir}/lua*/*
+%{_mandir}/man3/gv.3lua*
+
 %files perl
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/perl/
@@ -239,6 +273,12 @@ fi
 
 
 %changelog
+* Sun Mar 15 2015 Ryoichi INAGAKI <ryo1@toki.waaseda.jp> 2.38.0-2
+- added Patch0-5 from Fedora
+- rebuilt with guile 2.0.11
+- changed BR: tcl-devel, tk-devel instead of tcl, tk
+- added lua subpackage
+
 * Sat Jun 28 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2.38.0-1
 - update to 2.38.0