Browse Source

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

	* gnuchess, gphoto, parted, xfsprogs: rebuilt
	* jack-audio-connection-kit: updated
	


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

+ 4 - 1
g/gnuchess/gnuchess-vl.spec

@@ -2,7 +2,7 @@ Summary: The GNU chess program.
 Summary(ja): GNU チェスゲーム
 Name: gnuchess
 Version: 6.1.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: GPLv3+
 Group: Applications/Games
@@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(664,root,games) %{_var}/lib/games/%{name}/book.dat
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 6.1.2-2
+- rebuilt with readline 6.3
+
 * Tue Nov  4 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 6.1.2-1
 - updated to 6.1.2
 

+ 6 - 3
g/gphoto2/gphoto2-vl.spec

@@ -2,7 +2,7 @@ Summary:       Software for accessing digital cameras
 Summary(ja):   デジタルカメラにアクセスするためのソフトウェア
 Name:          gphoto2
 Version:       2.5.6
-Release:       1%{?_dist_release}
+Release:       2%{?_dist_release}
 
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -10,7 +10,7 @@ URL:           http://www.gphoto.org/
 
 Source:        http://prdownloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
 
-ExcludeArch: s390 s390x
+ExcludeArch:   s390 s390x
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libexif-devel >= 0.6.13
 BuildRequires: libgphoto2-devel >= 2.5.6
@@ -67,11 +67,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS README COPYING
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/gphoto2
 %{_mandir}/man1/gphoto2.1*
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.5.6-2
+- rebuilt with readline 6.3
+
 * Fri Feb 20 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.5.6-1
 - updated to 2.5.6
 - built with libgphoto2 2.5.7

+ 163 - 69
j/jack-audio-connection-kit/jack-audio-connection-kit-vl.spec

@@ -1,29 +1,51 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
-Version: 0.124.1
+Version: 1.9.10
 Release: 1%{?_dist_release}
-License: GPLv2 and LGPLv2
+# The entire source (~500 files) is a mixture of these three licenses
+License: GPLv2 and GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.jackaudio.org
 
-Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
-
-Patch0:	jack-audio-connection-kit-0.124.1-freebob_driver.patch
+#Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
+Source0: https://dl.dropbox.com/u/28869550/jack-%{version}.tar.bz2
+Source1: %{name}-README.Fedora
+Source2: %{name}-script.pa
+Source3: %{name}-limits.conf
+
+# No-date-footer hack to remove dates from doxygen documentation
+Patch0:        jack-audio-connection-kit-no_date_footer.patch
+# Build fix
+Patch1:        jack-doxygen-output-dir-fix.patch
+# We don't want the internal API documentation
+Patch2:        jack-apidoc-only.patch
+# Adjust default priority. RHBZ#795094
+Patch3:        jack-realtime-compat.patch
+# Enable renaming and reordering the jack ports RHBZ#887408
+Patch4:        jack-portnames.patch
+# Fix ppc64 mpd startup issue RHBZ#799552
+Patch5:        jack-ppc64-long.patch
+#Patch0:	jack-audio-connection-kit-0.124.1-freebob_driver.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: alsa-lib-devel
-BuildRequires: libsndfile-devel >= 1.0.0
-BuildRequires: pkgconfig
+BuildRequires: celt-devel
+BuildRequires: dbus-devel
 BuildRequires: doxygen
-BuildRequires: readline-devel, ncurses-devel
-BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
+BuildRequires: expat-devel
 BuildRequires: libfreebob-devel >= 1.0.0
 BuildRequires: libsamplerate-devel
-BuildRequires: celt-devel
-BuildRequires: libdb-devel
-BuildRequires: libuuid-devel
+BuildRequires: libsndfile-devel >= 1.0.0
+BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
+BuildRequires: python
+BuildRequires: readline-devel
+#BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
+#BuildRequires: libdb-devel
+#BuildRequires: libuuid-devel
 
-%define groupname jackuser
+%global groupname jackuser
+%global pagroup   pulse-rt
 
 Requires(pre): shadow-utils
 Requires(post): /sbin/ldconfig
@@ -41,57 +63,93 @@ designed from the ground up to be suitable for professional audio
 work. This means that it focuses on two key areas: synchronous
 execution of all clients, and low latency operation.
 
+%package dbus
+Summary:	Jack D-Bus launcher
+Group:		Applications/Multimedia
+Requires: 	%{name} = %{version}-%{release}
+
+%description dbus
+Launcher to start Jack through D-Bus.
+
+
 %package devel
-Summary: Development files for %{name}
-Summary(ja): %{name} の開発用ファイル
-Group: Development/Libraries
-Requires: %{name} = %{version}
-Requires: pkgconfig
+Summary: 	Development files for %{name}
+Summary(ja): 	%{name} の開発用ファイル
+Group: 		Development/Libraries
+Requires: 	%{name} = %{version}-%{release}
+Requires: 	pkgconfig
 
 %description devel
 Development files for the Jack Audio Connection Kit.
 
 %package example-clients
-Summary: Example clients that use Jack 
-Summary(ja): %{name} を利用したサンプルプログラム
-Group: Applications/Multimedia
-Requires: %{name} = %{version}
+Summary: 	Example clients that use Jack 
+Summary(ja): 	%{name} を利用したサンプルプログラム
+Group: 		Applications/Multimedia
+Requires: 	%{name} = %{version}-%{release}
 
 %description example-clients
 Small example clients that use the Jack Audio Connection Kit.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n jack-%{version}
+%patch0 -p1 -b .nodate
+%patch1 -p1 -b .outdir
+%patch2 -p1 -b .nointernalapi
+%patch3 -p1 -b .priority
+%patch4 -p1 -b .portnames
+%patch5 -p1 -b .mpd
+
+# Fix encoding issues
+for file in ChangeLog README TODO; do
+    sed 's|\r||' $file > $file.tmp
+    iconv -f ISO-8859-1 -t UTF8 $file.tmp > $file.tmp2
+    touch -r $file $file.tmp2
+    mv -f $file.tmp2 $file
+done
 
 %build
-# x86_64 issue reported by Rudolf Kastl (not checked, but not bad).
-autoreconf --force --install
-
-%configure \
-    --with-html-dir=%{_docdir} \
-    --enable-freebob \
-    --disable-oss \
-    --disable-portaudio \
-    --with-default-tmpdir=/dev/shm
-make %{?_smp_mflags}
+export CPPFLAGS="$RPM_OPT_FLAGS -O0"
+export PREFIX=%{_prefix}
+# Parallel build disabled as it fails sometimes
+./waf configure \
+      %{?_smp_mflags} \
+      --mandir=%{_mandir}/man1 \
+      --libdir=%{_libdir} \
+      --alsa \
+      --classic \
+      --clients 256 \
+      --dbus \
+      --doxygen \
+      --freebob \
+      --ports-per-application=2048
+
+./waf build %{?_smp_mflags} -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
+./waf --destdir=$RPM_BUILD_ROOT install
+
+# move doxygen documentation to the right place
+mv $RPM_BUILD_ROOT%{_datadir}/jack-audio-connection-kit/reference .
+rm -rf $RPM_BUILD_ROOT%{_datadir}/jack-audio-connection-kit
+
+# install our limits to the /etc/security/limits.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d
+sed -e 's,@groupname@,%groupname,g; s,@pagroup@,%pagroup,g;' \
+    %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/95-jack.conf
 
-# can't use the makeinstall macro, jack needs DESTDIR and prefix gets
-# added to it and messes up part of the install
-make install DESTDIR=$RPM_BUILD_ROOT
+# prepare README.Fedora for documentation including
+install -p -m644 %{SOURCE1} README.Fedora
 
-# remove extra install of the documentation
-rm -fr $RPM_BUILD_ROOT%{_docdir}
+# install pulseaudio script for jack (as documentation part)
+install -p -m644 %{SOURCE2} jack.pa
 
-# remove *.la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/jack/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# For compatibility with jack1
+mv $RPM_BUILD_ROOT%{_bindir}/jack_rec $RPM_BUILD_ROOT%{_bindir}/jackrec
 
-# Fix timestamps to avoid multiarch conflicts
-find doc/reference -type f | xargs touch -r doc/reference.doxygen.in
+# Fix permissions of the modules
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/jack/*.so $RPM_BUILD_ROOT%{_libdir}/libjack*.so.*.*.*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,72 +158,108 @@ rm -rf $RPM_BUILD_ROOT
 getent group %groupname > /dev/null || groupadd -r %groupname
 exit 0
 
-%post
-/sbin/ldconfig
-
-# Add default limits for jackuser group
-grep -q %groupname /etc/security/limits.conf > /dev/null 2>&1 || cat >> /etc/security/limits.conf << EOF
-
-## Automatically appended by jack-audio-connection-kit
-@%groupname - rtprio 20
-@%groupname - memlock 4194304
-EOF
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files 
 %defattr(-,root,root)
-%doc AUTHORS TODO COPYING*
+%doc ChangeLog README README_NETJACK2 TODO
+%doc README.Fedora
+%doc jack.pa
+%config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
 %{_bindir}/jackd
-%{_bindir}/jack_load
-%{_bindir}/jack_unload
-%{_bindir}/jack_freewheel
+%{_bindir}/jackrec
 %{_libdir}/jack/
-%{_mandir}/man1/jack*.1*
 %{_libdir}/libjack.so.*
+%{_libdir}/libjacknet.so.*
 %{_libdir}/libjackserver.so.*
+%{_mandir}/man1/jackrec.1*
+%{_mandir}/man1/jackd*.1*
+
+%files dbus
+%defattr(-,root,root)
+%{_bindir}/jackdbus
+%{_datadir}/dbus-1/services/org.jackaudio.service
+%{_bindir}/jack_control
 
 %files devel
 %defattr(-,root,root)
-%doc doc/reference
+%doc reference/html/
 %{_includedir}/jack/
 %{_libdir}/libjack.so
+%{_libdir}/libjacknet.so
 %{_libdir}/libjackserver.so
 %{_libdir}/pkgconfig/jack.pc
 
 %files example-clients
 %defattr(-,root,root)
+%{_bindir}/alsa_in
+%{_bindir}/alsa_out
 %{_bindir}/jack_alias
 %{_bindir}/jack_bufsize
 %{_bindir}/jack_connect
 %{_bindir}/jack_disconnect
+%{_bindir}/jack_cpu_load
 %{_bindir}/jack_evmon
-%{_bindir}/jack_impulse_grabber
-%{_bindir}/jack_iodelay
+%{_bindir}/jack_freewheel
+# These are not ready yet
+#{_bindir}/jack_impulse_grabber
+%exclude %{_mandir}/man1/jack_impulse_grabber.1*
 %{_bindir}/jack_latent_client
-%{_bindir}/jack_load_test
+%{_bindir}/jack_load
+%{_bindir}/jack_unload
 %{_bindir}/jack_lsp
 %{_bindir}/jack_metro
+%{_bindir}/jack_midi_dump
+%{_bindir}/jack_midi_latency_test
 %{_bindir}/jack_midiseq
 %{_bindir}/jack_midisine
-%{_bindir}/jack_midi_dump
 %{_bindir}/jack_monitor_client
+%{_bindir}/jack_net_master
+%{_bindir}/jack_net_slave
 %{_bindir}/jack_netsource
-%{_bindir}/jack_property
-%{_bindir}/jack_rec
 %{_bindir}/jack_samplerate
 %{_bindir}/jack_server_control
 %{_bindir}/jack_session_notify
 %{_bindir}/jack_showtime
 %{_bindir}/jack_simple_client
 %{_bindir}/jack_simple_session_client
+%{_bindir}/jack_thru
 %{_bindir}/jack_transport
-%{_bindir}/jack_transport_client
 %{_bindir}/jack_wait
-%{_bindir}/alsa_in
-%{_bindir}/alsa_out
+%{_bindir}/jack_zombie
+%{_mandir}/man1/alsa_*.1*
+%{_mandir}/man1/jack_bufsize.1*
+%{_mandir}/man1/jack_connect.1*
+%{_mandir}/man1/jack_disconnect.1*
+%{_mandir}/man1/jack_freewheel*.1*
+%{_mandir}/man1/jack_load*.1*
+%{_mandir}/man1/jack_unload*.1*
+%{_mandir}/man1/jack_lsp.1*
+%{_mandir}/man1/jack_metro.1*
+%{_mandir}/man1/jack_monitor_client.1*
+%{_mandir}/man1/jack_netsource.1*
+%{_mandir}/man1/jack_samplerate.1*
+%{_mandir}/man1/jack_showtime.1*
+%{_mandir}/man1/jack_simple_client.1*
+%{_mandir}/man1/jack_transport.1*
+%{_mandir}/man1/jack_wait.1*
+
+# tests
+%{_bindir}/jack_cpu
+%{_bindir}/jack_iodelay
+%{_bindir}/jack_multiple_metro
+%{_bindir}/jack_test
+%{_mandir}/man1/jack_iodelay.1*
+
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.9.10-1
+- updated to 1.9.10
+- built with readline 6.3
+- added dbus subpackage
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.124.1
 - update to 0.124.1
 - add BuildRequires: libdb-devel, libuuid-devel

+ 5 - 2
p/parted/parted-vl.spec

@@ -4,8 +4,8 @@ Summary: The GNU disk partition manipulation program.
 Summary(ja): ディスクパーティション操作ツール
 Name: parted
 Version: 3.2
-Release: 1%{?_dist_release}
-License: GPL
+Release: 2%{?_dist_release}
+License: GPLv3
 Group: Applications/Administration
 URL: http://www.gnu.org/software/parted/
 
@@ -112,6 +112,9 @@ fi
 %{_libdir}/pkgconfig/libparted.pc
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2-2
+- rebuilt with readline 6.3
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2-1
 - new upstream release
 

+ 10 - 6
x/xfsprogs/xfsprogs-vl.spec

@@ -1,8 +1,8 @@
 Summary:	Utilities for managing the XFS filesystem
-Summary(ja):	XFSファイルシステムを管理するためのユーティリティ
+Summary(ja):	XFS ファイルシステムを管理するためのユーティリティ
 Name:		xfsprogs
 Version:	3.2.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -14,9 +14,10 @@ Source0:	ftp://oss.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.tar
 Source1:	xfsprogs-wrapper.h
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	libtool, gettext
+BuildRequires:	e2fsprogs-devel
 BuildRequires:	libuuid-devel
-BuildRequires:  readline-devel
 BuildRequires:  libblkid-devel
+BuildRequires:  readline-devel
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -34,7 +35,7 @@ with the IRIX version of XFS.
 
 %package devel
 Summary: XFS filesystem-specific static libraries and headers
-Summary(ja): XFS filesystem-specific static libraries and headers
+Summary(ja): XFS ファイルシステム特有の静的ライブラリとヘッダファイル
 Group: Development/Libraries
 Requires: xfsprogs = %{version}-%{release}
 
@@ -99,18 +100,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc doc/CHANGES doc/COPYING doc/CREDITS README
 /sbin/*
+%{_sbindir}/*
 /%{_lib}/*.so.*
 %{_mandir}/man8/*
 %{_mandir}/man5/*
-%{_sbindir}/*
 
 %files devel
 %defattr(-,root,root)
-%{_mandir}/man3/*
 %{_includedir}/xfs
 %{_libdir}/*.so
+%{_mandir}/man3/*
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2.0-2
+- rebuilt with readline 6.3
+
 * Fri Jul  4 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.0-1
 - new upstream release.