Browse Source

2014-12-16 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* golang, python-subprocess32: added Group
	* libquvi: changed Group
	* libquvi-scripts: updated, changed Group
	* pilot-link: added patches
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9157 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
b8000684b1

+ 17 - 13
g/golang/golang-vl.spec

@@ -25,33 +25,34 @@
 
 Name:           golang
 Version:        1.2
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        The Go Programming Language
+Summary(ja):    プログラミング言語 Go
 
 License:        BSD
+Group:          Development/Languages
 URL:            http://golang.org/
-Source0:        https://go.googlecode.com/files/go%{version}.src.tar.gz
-
-# 'hostname' command
-BuildRequires:  net-tools
 
-# We strip the meta dependency, but go does require glibc.
-# This is an odd issue, still looking for a better fix.
-Requires:       glibc
+Source0:        https://go.googlecode.com/files/go%{version}.src.tar.gz
+Source100:      golang-gdbinit
+Source101:      golang-prelink.conf
 
 Patch0:         golang-1.2-verbose-build.patch
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=1038683
 Patch2:         golang-1.2-remove-ECC-p224.patch
-
 # disable flaky test for now
 # http://code.google.com/p/go/issues/detail?id=6522
 Patch3:         ./golang-1.2-skipCpuProfileTest.patch
 
-ExclusiveArch:  %{ix86} x86_64
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+# 'hostname' command
+BuildRequires:  net-tools
 
-Source100:      golang-gdbinit
-Source101:      golang-prelink.conf
+# We strip the meta dependency, but go does require glibc.
+# This is an odd issue, still looking for a better fix.
+Requires:       glibc
+
+ExclusiveArch:  %{ix86} x86_64
 
 %description
 %{summary}.
@@ -178,6 +179,9 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
 %{_sysconfdir}/prelink.conf.d
 
 %changelog
+* Mon Dec 15 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.2-2
+- added Group tag
+
 * Sat Feb  1 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 1.2
 - initial build for Vine Linux
 - drop emacs and vim package

+ 10 - 7
lib/libq/libquvi-scripts/libquvi-scripts-vl.spec

@@ -1,18 +1,17 @@
 Summary:	Lua scripts for libquvi
 Summary(ja):	libquvi 用 Lua スクリプト集
 Name:		libquvi-scripts
-Version:	0.4.9
+Version:	0.4.21
 Release:	1%{?_dist_release}
-Source0:	%{name}-%{version}.tar.xz
+
 License:	LGPLv2.1+
-Group:		Applications/Internet 
+Group:		System Environment/Libraries
 URL:		http://quvi.sourceforge.net/ 
 
-BuildRequires:	gzip
-BuildRequires:	curl-devel
-BuildRequires:	lua-devel
+Source0:	%{name}-%{version}.tar.xz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:  gzip
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -41,7 +40,7 @@ libquvi-scripts.
 
 
 %build
-%configure --disable-static
+%configure
 %{__make} %{?_smp_mflags}
 
 
@@ -67,6 +66,10 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man7/libquvi-scripts.7
 %{_libdir}/pkgconfig/libquvi-scripts.pc
 
 %changelog
+* Tue Dec 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.4.21-1
+- updated to 0.4.21
+- moved libquvi-scripts to System Environment/Libraries Group
+
 * Sun Nov 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.9-1
 - new upstream release
 

+ 9 - 6
lib/libq/libquvi/libquvi-vl.spec

@@ -2,19 +2,19 @@ Summary:	C library for parsing Adobe Flash media stream URLs
 Summary(ja):	AdobeFlash メディアストリーム URL を解析するための C ライブラリ
 Name:		libquvi
 Version:	0.4.1
-Release:	1%{?_dist_release}
-Source0:	%{name}-%{version}.tar.xz
+Release:	2%{?_dist_release}
 License:	LGPLv2.1+
-Group:		Applications/Internet 
+Group:		System Environment/Libraries
 URL:		http://quvi.sourceforge.net/ 
 
+Source0:	%{name}-%{version}.tar.xz
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	curl-devel
 BuildRequires:	gzip
 BuildRequires:	libquvi-scripts-devel
-BuildRequires:	curl-devel
 BuildRequires:	lua-devel
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: Takemikaduchi
@@ -79,6 +79,9 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man3/libquvi.3
 %{_libdir}/pkgconfig/libquvi.pc
 
 %changelog
+* Tue Dec 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.4.1-2
+- moved libquvi to System Environment/Libraries Group
+
 * Wed Apr 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.1-1
 - initial build for Vine Linux
 

+ 76 - 42
p/pilot-link/pilot-link-vl.spec

@@ -1,6 +1,6 @@
 %define	ver	0.12.5
 %define	srcver	%{ver}
-%define	rel	2%{?_dist_release}
+%define	rel	3%{?_dist_release}
 %define support_perl 0
 
 Name:		pilot-link
@@ -10,22 +10,30 @@ Version:	%{ver}
 Release:	%{rel}
 Epoch:		1
 
-Group:		Applications/Other
-License:	GPL/LGPL
+# libpisock/md5.c       Public Domain
+# libpisock/blob.c      LGPLv2+
+# libpisock/contact.c   GPLv2
+# kittykiller.c         GPLv2+
+License:        GPLv2 and GPLv2+ and LGPLv2+ and Public Domain
+Group:          Applications/Communications
 URL:            http://www.pilot-link.org/
 
-Source0:		http://downloads.pilot-link.org/pilot-link-%{version}.tar.bz2
+Source0:	http://downloads.pilot-link.org/pilot-link-%{version}.tar.bz2
 Source1:	connect-palm-ppp.tar.bz2
 Source2:	60-libpisock.rules.vine
+Source3:        60-pilot.perms
 
-# (fc) 0.10.99 fix python/perl installation
-Patch1:		pilot-link-0.11.0-perlmd5.patch
-Patch2:		pilot-link-0.11.0-perlpollute.patch
-Patch3:		pilot-link-0.11.2-malsync.patch
+Patch0: 	pilot-link-0.12.1-var.patch
+Patch1: 	pilot-link-0.12.2-open.patch
+Patch2: 	pilot-link-0.12.3-clio.patch
+Patch3: 	pilot-link-0.12.5-mp.patch
+Patch4: 	pilot-link-0.12.5-redefinePerlsymbols.patch
+Patch5: 	pilot-link-0.12.5-compiler_warnings.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	bison >= 1.35
 BuildRequires:	libusb-devel >= 0.1
+BuildRequires:	libpng-devel
 BuildRequires:	readline-devel
 BuildRequires:	bluez-libs-devel
 BuildRequires:	popt-devel
@@ -59,66 +67,76 @@ Palm handheld device を Vine Linux システムで同期させたい場合は
 pilot-link をインストールします。
 
 %package libs
-Summary:	Runtime libraries for %{name}
-Summary(ja): 	%{name} のランタイムライブラリ
+Summary:        PalmPilot libraries
+Summary(ja): 	Palm handheld ライブラリ
 Group:		System Environment/Libraries
-Requires:	libusb >= 0.1
 
 %description libs
-This package provides the shared libraries for any pilot-link client 
-program or interface.
+Libraries for applications communicating with PalmPilot
 
 %package devel
 Summary:	PalmPilot development header files.
 Summary(ja): 	Palm handheld プログラム開発用のヘッダ ファイル
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{epoch}:%{version}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 
 %description devel
 This package contains the development headers that are used to build
-the pilot-link package.  It also includes the static libraries
-necessary to build static pilot apps.
+the pilot-link package. 
 
 If you want to develop PalmPilot synchronizing applications, you'll
 need to install pilot-link-devel.
 
 %description devel -l ja
 このパッケージには、pilot-link パッケージを構築する為に必要な開発用の
-ヘッダ ファイルが含まれます。また、スタティックな Palm 用アプリケーション
-の構築に必要なスタティック ライブラリも含まれます。
+ヘッダファイルが含まれます。
 
 Palm handheld deviceと同期するアプリケーションを開発したい場合は、
 pilot-link-devel パッケージをインストールする必要があります。
 
 %prep 
 %setup -q -a 1
-%if %{support_perl}
-%patch1 -p1 -b .perlmd5
-%patch2 -p1 -b .perlpollute
-%patch3 -p1 -b .malsync
-%endif
+%patch0 -p1 -b .var
+%patch1 -p1 -b .open
+%patch2 -p1 -b .clio
+%patch3 -p1 -b .mp
+%patch4 -p1 -b .symbol
+%patch5 -p1 -b .compiler
+
+iconv -f windows-1252 -t UTF8 doc/README.usb > doc/README.usb.aux
+mv doc/README.usb.aux doc/README.usb
+iconv -f windows-1252 -t UTF8 ChangeLog > ChangeLog.aux
+mv ChangeLog.aux ChangeLog
+iconv -f windows-1252 -t UTF8 NEWS > NEWS.aux
+mv NEWS.aux NEWS
 
 %build
-%configure\
-  --disable-static \
-  --enable-conduits \
-  --enable-libusb \
-  --with-libpng \
-  --with-bluez \
-  --without-python \
-  --without-tcl \
-  --without-java \
+%configure \
+    --disable-static \
+    --enable-conduits \
+    --enable-libusb \
+    --with-libpng \
+    --with-bluez \
+    --without-python \
+    --without-tcl \
+    --without-java \
 %if %{support_perl}
-  --with-perl
+    --with-perl
 %else
-  --without-perl
+    --without-perl
 %endif
 
-make
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir}
+make install -C doc/man DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir}
+
 %if %{support_perl}
 if test -f bindings/Perl/Makefile.PL ; then
    cd bindings/Perl
@@ -129,22 +147,30 @@ if test -f bindings/Perl/Makefile.PL ; then
 fi
 %endif
 
-%__make install DESTDIR=$RPM_BUILD_ROOT
-#%makeinstall -C doc/man
 
 %if %{support_perl}
 make install -C bindings/Perl
-rm -f %{buildroot}%{_libdir}/perl5/vendor_perl/%{perl_version}/*/auto/PDA/Pilot/Pilot.bs \
-      %{buildroot}%{_libdir}/perl5/site_perl/*/*/*/PDA/Pilot/.packlist
+rm -f $RPM_BUILD_ROOT%{_libdir}/perl5/vendor_perl/%{perl_version}/*/auto/PDA/Pilot/Pilot.bs \
+      $RPM_BUILD_ROOT%{_libdir}/perl5/site_perl/*/*/*/PDA/Pilot/.packlist
 %endif
 
 # install modified udev rules.
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libpisock.rules
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+#install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libpisock.rules
 
 # remove files we don't want to include
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
+# remove broken prog
+rm -f $RPM_BUILD_ROOT%{_bindir}/pilot-prc
+
+# install visor configs to share/udev
+install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pilot-link/udev
+
+# now that rules are moved out HAL, install to /lib/udev/
+install -d $RPM_BUILD_ROOT/lib/udev/rules.d/
+install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT/lib/udev/rules.d/60-libpisock.rules
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -162,7 +188,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %files libs
 %defattr(-,root,root)
 %doc COPYING.LIB 
-%{_sysconfdir}/udev/rules.d/60-libpisock.rules
+/lib/udev/rules.d/60-libpisock.rules
+#{_sysconfdir}/udev/rules.d/60-libpisock.rules
 %{_libdir}/*.so.*
 %if %{support_perl}
 %{_libdir}/perl5/vendor_perl/*/*/*/PDA
@@ -181,6 +208,13 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 
 %changelog
+* Tue Dec 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.12.5-3
+- added Patch1, 2, 3, 4 and 5 from Fedora
+- added Source3 from Fedora
+- built with libpng 1.6.12
+- updated devel description 
+- moved main package to Applications/Communications Group
+
 * Sat Sep 13 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 0.12.5-2
 - rebuilt with current environment
 

+ 11 - 1
p/python-subprocess32/python-subprocess32-vl.spec

@@ -2,14 +2,17 @@
 
 Name:           python-subprocess32
 Version:        3.2.6
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Backport of subprocess module from Python 3.2 to Python 2.*
 Summary(ja):    Python 3.2 の subprocess モジュールの python 2.x へのバックポート
 
 License:        Python
+Group:          System Environment/Libraries
 URL:            http://pypi.python.org/pypi/subprocess32/
+
 Source0:        http://python-subprocess32.googlecode.com/files/subprocess32-%{version}.tar.gz
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  python-devel
 
 Distribution: Vine Linux
@@ -29,12 +32,16 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 
 %check
 PYTHONPATH=$(pwd) %{__python} test_subprocess32.py
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 
 %files
 %doc LICENSE README.txt
@@ -44,6 +51,9 @@ PYTHONPATH=$(pwd) %{__python} test_subprocess32.py
 
 
 %changelog
+* Mon Dec 15 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2.6-2
+- added Group tag
+
 * Mon Aug 04 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 3.2.6-1
 - initial build for Vine Linux