2015-01-07 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* accerciser: changed Group
	* asciidoc: updated and changed Group
	* bashdb: updated and changed Group
	* itcl: updated
	


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

a/accerciser/accerciser-vl.spec

@@ -2,7 +2,7 @@
 
 
 %define pkg_version 3.14.0
-%define pkg_release 1%{?_dist_release}
+%define pkg_release 2%{?_dist_release}
 
 Summary:	An interactive Python accessibility explorer for the GNOME desktop.
 Summary(ja):	GNOME デスクトップ用 Python アクセシビリティエクスプローラ
@@ -11,7 +11,7 @@ Version:	%{pkg_version}
 Release:	%{pkg_release}
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/accerciser/3.14/%{name}-%{version}.tar.xz
 License:	BSD
-Group:		Desktop/Accessibility 
+Group:		User Interface/Desktops
 URL:		http://live.gnome.org/Accerciser
 
 Requires:	python3 >= 3.2
@@ -54,7 +54,7 @@ you can use to create custom views of accessibility information.
 
 
 %build
-%configure  --disable-static
+%configure
 %{__make} %{?_smp_mflags}
 
 %install
@@ -96,6 +96,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Mon Jan  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.14.0-2
+- moved to User Interface/Desktops Group
+
 * Sun Oct 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.0-1
 - new upstream release
 

a/asciidoc/asciidoc-vl.spec

@@ -1,21 +1,24 @@
 Summary: Text based document generation
 Summary(ja): テキストベースのドキュメント生成
 Name: asciidoc
-Version: 8.6.6
+Version: 8.6.9
 Release: 1%{?_dist_release}
-License: GPL
+License: GPLv2+
-Group: Applications/System
+Group: Applications/Text
-URL: http://www.methods.co.nz/asciidoc/
+URL: http://asciidoc.org/
-Vendor: Project Vine
+
-Distribution: Vine Linux
-Packager: daisuke, kenta
 Source0: http://downloads.sourceforge.net/project/asciidoc/asciidoc/%{version}/%{name}-%{version}.tar.gz
+
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python
 Requires: python
 Requires: docbook-style-xsl
 Requires: libxslt
-BuildArch: noarch
+
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke, kenta
 
 %description
 AsciiDoc is a text document format for writing short documents,
@@ -44,9 +47,13 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %{_mandir}/man1/*
 %{python_sitelib}/asciidocapi.py*
-%doc README BUGS CHANGELOG COPYRIGHT
+%doc BUGS CHANGELOG COPYING COPYRIGHT README
 
 %changelog
+* Tue Jan  6 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.6.9-1
+- new upstream version
+- moved to Applications/Text Group
+
 * Sun Feb 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 8.6.6-1
 - new upstream version
 

b/bashdb/bashdb-vl.spec

@@ -1,12 +1,12 @@
-%define	first_version	4.2
+%define	first_version	4.3
-%define	second_version	0.8
+%define	second_version	0.91
 
 # Basic Information
 Name:		bashdb
 Version:	%{first_version}.%{second_version}
 Release:	1%{?_dist_release}
 License:	GPLv2
-Group:		Development/Tools
+Group:		Development/Debuggers
 URL:		http://bashdb.sourceforge.net/
 Source0:	%{name}-%{first_version}-%{second_version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -47,7 +47,7 @@ bashdb は、デバッグしたい他の bash スクリプトを準備するた
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
 # remove unnecessary files.
-%{__rm} ${RPM_BUILD_ROOT}%{_infodir}/dir
+%{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -71,5 +71,9 @@ fi
 %{_bindir}/bashdb
 
 %changelog
+* Mon Jan  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.3.0.91-1
+- new upstream release
+- moved to Development/Debuggers Group
+
 * Sat Oct 15 2011 Yasumichi Akahoshi <yasumichi@vinelinux.org> 4.2.0.8-1
 - initial build for Vine Linux

i/itcl/itcl-vl.spec

@@ -1,26 +1,27 @@
-%define	tcl_major	8.4
+%define	tcl_major	8.5
-%define	tk_major	8.4
+%define	tk_major	8.5
-%define thread_major	2.6
+%define thread_major	2.7
-%define	itcl_major	3.2
+%define	itcl_major	3.4
 %define	itclvers	%{itcl_major}.1
 
 Summary: [Incr Tcl] OOP Extension for TCL
 Summary(ja): [Incr Tcl] TCL のオブジェクト指向拡張
 Name: itcl
 Version: %{itclvers}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Group: Development/Languages
 License: BSD
-Source0: http://prdownloads.sourceforge.net/incrtcl/itcl%{itclvers}_src.tgz
+Source0: http://prdownloads.sourceforge.net/incrtcl/itcl%{itclvers}.tar.gz
 Patch31: itcl-3.2.1-makecfg.patch
 
+Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tcl >= %{tcl_major}
 BuildRequires: tk >= %{tk_major}
 BuildRequires: thread >= %{thread_major}
 Requires: tcl >= %{tcl_major}
 Requires: tk >= %{tk_major}
 Requires: thread >= %{thread_major}
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+
 Distribution: Vine Linux
 Vendor: Project Vine
 
@@ -58,7 +59,7 @@ the resulting code is easier to understand and maintain.
 
 %prep
 %setup -q -n %{name}%{itclvers}
-%patch31 -p1 -b .makecfg
+#patch31 -p1 -b .makecfg
 
 
 #==========================================
@@ -71,95 +72,56 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_REENTRANT"
 # Itcl
 #
 %configure \
-	--enable-shared \
+    --enable-shared \
-	--enable-threads \
+    --enable-threads \
-	--with-tcl=%{_libdir} \
+    --with-tcl=%{_libdir} 
-	--with-tk=%{_libdir} \
 
 make
 
 #==========================================
 %install
 rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}
-rm -f *.files
-
 
 #------------------------------------------
 # Itcl
 #
-%makeinstall \
+make install DESTDIR=$RPM_BUILD_ROOT \
-	ITCL_LIBRARY=$RPM_BUILD_ROOT%{_datadir}/itcl%{itcl_major} \
+	ITCL_LIBRARY=%{_datadir}/itcl%{itcl_major} \
-	ITK_LIBRARY=$RPM_BUILD_ROOT%{_datadir}/itk%{itcl_major}
+	ITK_LIBRARY=%{_datadir}/itk%{itcl_major}
 
 # fixed *Config variables
 ln -sf ../itclConfig.sh $RPM_BUILD_ROOT%{_libdir}/itcl%{itcl_major}/itclConfig.sh
-ln -sf ../itkConfig.sh $RPM_BUILD_ROOT%{_libdir}/itk%{itcl_major}/itkConfig.sh
+#ln -sf ../itkConfig.sh $RPM_BUILD_ROOT%{_libdir}/itk%{itcl_major}/itkConfig.sh
 
-echo "ITCL_SRC_DIR='%{_includedir}/tcl%{tcl_major}/'" >> $RPM_BUILD_ROOT%{_libdir}/itcl%{itcl_major}/itclConfig.sh
+#echo "ITCL_SRC_DIR='%{_includedir}/tcl%{tcl_major}/'" >> $RPM_BUILD_ROOT%{_libdir}/itcl%{itcl_major}/itclConfig.sh
-echo "ITCL_BUILD_LIB_SPEC='-L%{_libdir} -litcl%{itcl_major}'" >> $RPM_BUILD_ROOT%{_libdir}/itcl%{itcl_major}/itclConfig.sh
+#echo "ITCL_BUILD_LIB_SPEC='-L%{_libdir} -litcl%{itcl_major}'" >> $RPM_BUILD_ROOT%{_libdir}/itcl%{itcl_major}/itclConfig.sh
 
 # install include files
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/tcl%{tcl_major}/generic
+#mkdir -p $RPM_BUILD_ROOT%{_includedir}/tcl%{tcl_major}/generic
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/tk%{tk_major}/generic
+#mkdir -p $RPM_BUILD_ROOT%{_includedir}/tk%{tk_major}/generic
-
-
-cp itcl/generic/*.h $RPM_BUILD_ROOT%{_includedir}/tcl%{tcl_major}/generic
-cp itk/generic/*.h $RPM_BUILD_ROOT%{_includedir}/tk%{tk_major}/generic
-
-rm -rf  $RPM_BUILD_ROOT%{_mandir}/mann/dialog.*
-rm -rf  $RPM_BUILD_ROOT%{_mandir}/mann/menubar.*
 
-echo "%%defattr(-,root,root)" > itcl.files
+#cp itcl/generic/*.h $RPM_BUILD_ROOT%{_includedir}/tcl%{tcl_major}/generic
-(find ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_includedir} \
+#cp itk/generic/*.h $RPM_BUILD_ROOT%{_includedir}/tk%{tk_major}/generic
-        ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l;
- find ${RPM_BUILD_ROOT}%{_libdir}/*) | cat - *.files \
-        | sort | uniq -u >> itcl.files
-
-set +x +H
-for n in `cat itcl.files`; do
-        [ -f $n ] || continue
-        head -1 $n | grep -q ^#! || continue
-        chmod u+w $n
-        perl -pi -e "s|${RPM_BUILD_ROOT}||" $n
-done
-set -x -H
-
-#==========================================
-# post process the *.files list, removing build sys references and mark
-# which are directories
-
-set +x
-for n in *.files; do
-        mv $n $n.in
-        sed "s|.*%{_prefix}\\>|%{_prefix}|" < $n.in | while read file; do
-            if [ -d ${RPM_BUILD_ROOT}/$file ]; then
-                echo -n '%dir '
-            fi
-            echo $file
-        done > $n
-        rm -f $n.in
-done
-set -x
-
-# Man pages can be compressed
-perl -pi -e 's|(^%{_mandir}/man.*$)|\1\*|' *.files
 
 #==========================================
-%post -p /sbin/ldconfig -n itcl
-
-%postun -p /sbin/ldconfig -n itcl
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f itcl.files -n itcl
+#-f itcl.files -n itcl
+%files
 %defattr(-,root,root,-)
-%{_datadir}/itcl%{itcl_major}
+%doc doc/license.terms
-%{_datadir}/itk%{itcl_major}
+%{_includedir}/*.h
+%{_libdir}/%{name}%{itcl_major}/*
+%{_libdir}/itclConfig.sh
+%{_mandir}/mann/*.gz
 
 
 %changelog
+* Mon Jan  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.4.1-1
+- updated to 3.4.1
+- built with tcl/tk 8.5.15 and thread 2.7.1
+
 * Tue Jun 29 2010 Shu KONNO <owa@bg.wakwak.com> 3.2.1-2
 - rebuilt with tcl/tk-8.4.19-2