Browse Source

updated: MySQL, libmtp, taglib
NEW: taglib-extras


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

inagaki 13 years ago
parent
commit
e66116bf37
4 changed files with 289 additions and 74 deletions
  1. 82 42
      M/MySQL/MySQL-vl.spec
  2. 50 20
      lib/libm/libmtp/libmtp-vl.spec
  3. 133 0
      t/taglib-extras/taglib-extras-vl.spec
  4. 24 12
      t/taglib/taglib-vl.spec

+ 82 - 42
M/MySQL/MySQL-vl.spec

@@ -27,22 +27,27 @@
 Packager:	tomop
 Name: MySQL
 Summary:	MySQL: a very fast and reliable SQL database server
-Group:		Applications/Databases
 Version:	%{mysql_version}
-Release:	1%{_dist_release}
-License:	GPL
+Release:	2%{_dist_release}
+
+Group:		Applications/Databases
+# exceptions allow client libraries to be linked with most open source SW,
+# not only GPL code.
+License:	GPLv2 with exceptions
+URL:		http://www.mysql.com/
+
 Source:		mysql-%{version}.tar.gz
 # Don't depend on lib::mtr*
 Source999:	filter-requires-%{name}.sh
 Patch0:		mysql-5.1.44-jp-all.patch
-URL:		http://www.mysql.com/
-Requires:	fileutils sh-utils
-Provides:	msqlormysql MySQL-server mysql
-Obsoletes:	mysql MySQL5
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  perl, readline-devel
 BuildRequires:  gcc-c++, ncurses-devel, zlib-devel
 BuildRequires:  groff, libtool, automake
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+Requires:	fileutils sh-utils
+Provides:	msqlormysql MySQL-server mysql
+Obsoletes:	mysql MySQL5
 
 # From the manual
 %description
@@ -161,7 +166,7 @@ This package contains the MySQL regression test suite.
 
 %package devel
 Summary: MySQL - Development header files and libraries
-Group: Applications/Databases
+Group: Development/Libraries
 Requires: %{libpkgname} = %{version}-%{release}
 Provides: mysql-devel MySQL5-devel
 Obsoletes: mysql-devel MySQL5-devel
@@ -173,8 +178,8 @@ necessary to develop MySQL client applications.
 %{see_base}
 
 %package -n %{libpkgname}
-Summary: MySQL - Shared libraries
-Group: Applications/Databases
+Summary: The shared libraries required for MySQL clients
+Group: System Environment/Libraries
 %if %{?_dist_release}!="vl5"
 Obsoletes: MySQL-shared < %{version}
 %endif
@@ -184,28 +189,34 @@ This package contains the shared libraries (*.so*) which certain
 languages and applications need to dynamically load and use MySQL.
 
 
-#%package embedded
-#Requires: %{name}-devel = %{version}-%{release}
-#Summary: MySQL - embedded library
-#Group: Applications/Databases
-#Obsoletes: mysql-embedded MySQL5-embedded
-#Provides: mysql-embedded MySQL5-embedded
+%package embedded
+Summary: MySQL as an embeddable library
+Group: System Environment/Libraries
+Obsoletes: mysql-embedded MySQL5-embedded
+Provides: mysql-embedded MySQL5-embedded
 
-#%description embedded
-#This package contains the MySQL server as an embedded library.
+%description embedded
+MySQL is a multi-user, multi-threaded SQL database server. This
+package contains a version of the MySQL server that can be embedded
+into a client application instead of running as a separate process.
 
-#The embedded MySQL server library makes it possible to run a
-#full-featured MySQL server inside the client application.
-#The main benefits are increased speed and more simple management
-#for embedded applications.
+%{see_base}
 
-#The API is identical for the embedded MySQL version and the
-#client/server version.
+%package embedded-devel
+Summary: Development files for MySQL as an embeddable library
+Group: Development/Libraries
+Requires: %{name}-embedded = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
 
-#%{see_base}
+%description embedded-devel
+MySQL is a multi-user, multi-threaded SQL database server. This
+package contains files needed for developing and testing with
+the embedded version of the MySQL server.
+
+%{see_base}
 
 %prep
-%setup -T -a 0 -c -n mysql-%{mysql_version}
+%setup -q -T -a 0 -c -n mysql-%{mysql_version}
 mv mysql-%{mysql_version} mysql-debug-%{mysql_version}
 
 pushd mysql-debug-%{mysql_version}
@@ -217,7 +228,7 @@ automake --add-missing --copy
 autoconf
 popd
 
-%setup -D -T -a 0 -n mysql-%{mysql_version}
+%setup -q -D -T -a 0 -n mysql-%{mysql_version}
 mv mysql-%{mysql_version} mysql-release-%{mysql_version}
 
 pushd mysql-release-%{mysql_version}
@@ -244,7 +255,8 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
  	    $* \
 	    --with-mysqld-ldflags='-static' \
 	    --with-client-ldflags='-static' \
-	    --with-zlib-dir=bundled \
+	    --with-zlib-dir=/usr \
+            --enable-silent-rules \
 	    --enable-assembler \
 	    --enable-local-infile \
 	    --with-fast-mutexes \
@@ -350,6 +362,19 @@ CFLAGS="$CFLAGS" \
 CXXFLAGS="$CXXFLAGS" \
 BuildMySQL --with-embedded-server
 )
+
+pushd mysql-release-%{mysql_version}
+# regular build will make libmysqld.a but not libmysqld.so :-(
+mkdir libmysqld/work
+cd libmysqld/work
+ar -x ../libmysqld.a
+# remove object file to avoid multiple definition error (is it a bug?)
+rm -f libfederated_a-ha_federated.o
+gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 \
+	*.o \
+	-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
+popd
+
 # We might want to save the config log file
 if test -n "$MYSQL_CONFLOG_DEST"
 then
@@ -401,6 +426,11 @@ fi
 
 ##############################################################################
 
+# install libmysqld.so
+install -m 0755 $MBD/libmysqld/work/libmysqld.so.0.0.1 $RPM_BUILD_ROOT%{_libdir}/mysql/libmysqld.so.0.0.1
+ln -s libmysqld.so.0.0.1 $RPM_BUILD_ROOT%{_libdir}/mysql/libmysqld.so.0
+ln -s libmysqld.so.0 $RPM_BUILD_ROOT%{_libdir}/mysql/libmysqld.so
+
 # install "mysqld-debug"
 $MBD/libtool --mode=execute install -m 755 \
                  $RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-debug-%{mysql_version}/sql/mysqld \
@@ -729,25 +759,35 @@ fi
 # Shared libraries (omit for architectures that don't support them)
 %{_libdir}/mysql/libmysql*.so.*
 %{_libdir}/mysql/libndb*.so.*
+%exclude %{_libdir}/mysql/libmysqld.so.*
 /etc/ld.so.conf.d/*
 
 %files test
 %defattr(-, root, root, 0755)
-%attr(-, root, root) %{_datadir}/mysql-test
-%attr(755, root, root) %{_bindir}/mysql_client_test
-%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
-%attr(755, root, root) %{_bindir}/mysqltest_embedded
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
-
-#%files embedded
-#%defattr(-, root, root, 0755)
-#%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
+%{_datadir}/mysql-test
+%{_bindir}/mysql_client_test
+%{_mandir}/man1/mysql_client_test.1*
+%{_mandir}/man1/mysql-stress-test.pl.1*
+%{_mandir}/man1/mysql-test-run.pl.1*
+
+%files embedded
+%defattr(-, root, root, 0755)
+%doc mysql-release-%{mysql_version}/{COPYING,EXCEPTIONS-CLIENT}
+%{_libdir}/mysql/libmysqld.so.*
+
+%files embedded-devel
+%defattr(-,root,root)
+%{_libdir}/mysql/libmysqld.so
+#{_libdir}/mysql/libmysqld.a
+%{_bindir}/mysql_client_test_embedded
+%{_bindir}/mysqltest_embedded
+%{_mandir}/man1/mysql_client_test_embedded.1*
+%{_mandir}/man1/mysqltest_embedded.1*
 
 %changelog
+* Sun Oct 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 5.1.44-2
+- made embedded package again
+
 * Fri Mar 05 2010 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.1.44-1
 - new upstream release.
 - updated jp-patch.

+ 50 - 20
lib/libm/libmtp/libmtp-vl.spec

@@ -1,19 +1,20 @@
 Name:           libmtp
-Version:        0.3.7
-Release:        2%{?_dist_release}
 Summary:        A software library for MTP media players
-Summary(ja):    MTPメディアプレイヤーのためのソフトウェアライブラリ
-URL:            http://libmtp.sourceforge.net/
+Summary(ja):    MTP メディアプレイヤーのためのソフトウェアライブラリ
+Version:        1.0.3
+Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://libmtp.sourceforge.net/
+
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		libmtp-0.2.6.1-simpler-rules.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-License:        LGPLv2+
-Requires:       udev
-Requires:	hal
 BuildRequires:  libusb-devel
 BuildRequires:  doxygen
+Requires:       udev
 
 %description
 This package provides a software library for communicating with MTP
@@ -25,11 +26,20 @@ players etc.
 MTP (Media Transfer Protocol) メディアプレイヤーのための
 ソフトウェアライブラリを提供します.
 
+%package hal
+Summary: Music player information for HAL
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: hal-info
+
+%description hal
+This package provides information about detecting MTP devices using HAL.
+
 %package examples
-Summary:        Example programs for libmtp
-Summary(ja):    libmtpのためのプログラム例集
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
+Summary: Example programs for libmtp
+Summary(ja): libmtp のプログラム例集
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
 
 %description examples
 This package provides example programs for communicating with MTP
@@ -39,11 +49,11 @@ devices.
 このパッケージは MTP デバイスを用いて通信するためのプログラム例集を提供します.
 
 %package devel
-Summary:        Development files for libmtp
-Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
-Requires:       libusb-devel
+Summary: Development files for libmtp
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+Requires: libusb-devel
 
 %description devel
 This package provides development files for the libmtp
@@ -60,15 +70,27 @@ library for MTP media players.
 %build
 %configure --disable-static --program-prefix=mtp-
 make %{?_smp_mflags}
-# Remove permissions from symlink in udev script, we use
-# HALd rules to fix the permissions instead.
-examples/hotplug -a"SYMLINK+=\"libmtp-%k\"" > libmtp.rules
+# Remove permissions from udev rules, but register for ACL management
+examples/hotplug -a"SYMLINK+=\"libmtp-%k\" ENV{ACL_MANAGE}=\"0\" TAG+=\"udev-acl\"" > libmtp.rules
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # Remove libtool archive remnant
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmtp.la
+# Replace links with relative links
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-delfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-getfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-newfolder
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-sendfile
+rm -f $RPM_BUILD_ROOT%{_bindir}/mtp-sendtr
+pushd $RPM_BUILD_ROOT%{_bindir}
+ln -sf mtp-connect mtp-delfile
+ln -sf mtp-connect mtp-getfile
+ln -sf mtp-connect mtp-newfolder
+ln -sf mtp-connect mtp-sendfile
+ln -sf mtp-connect mtp-sendtr
+popd
 # Install udev rules file.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 install -p -m 644 libmtp.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libmtp.rules
@@ -101,7 +123,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root,root,-)
 %{_libdir}/*.so.*
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*
-%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+
+%files hal
+%defattr(-, root,root,-)
+%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
+
 %files examples
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -116,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.0.3-1
+- updated to 1.0.3
+- Split out hal sub-package
+
 * Sun Oct 03 2010 Shu KONNO <owa@bg.wakwak.com> 0.3.7-2
 - rebuilt with rpm-4.8.1 for pkg-config
 

+ 133 - 0
t/taglib-extras/taglib-extras-vl.spec

@@ -0,0 +1,133 @@
+Name:           taglib-extras
+Summary:        Taglib support for other formats 
+Version:        1.0.1
+Release:        2%{?_dist_release}
+
+Group:          System Environment/Libraries
+# all LGPLv2, except for rmff/ which is GPLv2+/LGPLv2+
+License:        LGPLv2
+URL:            http://websvn.kde.org/trunk/kdesupport/taglib-extras/
+
+Source0:	http://www.kollide.net/~jefferai/taglib-extras-%{version}.tar.gz
+
+# taglib-extras-config: drop multilib-conflicting mention of libdir, since
+# it's already in default linker search path
+Patch1: taglib-extras-0.1-multilib-1.patch
+
+## upstream patches
+Patch100: taglib-extras-1.0.1-version.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: cmake >= 2.6.0
+BuildRequires: taglib-devel >= 1.6
+
+Requires: taglib >= 1.6
+
+%description
+Taglib-extras delivers support for reading and editing the meta-data of 
+audio formats not supported by taglib.
+
+
+%package devel
+Summary: Development files for %{name}
+Group:   Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+%{summary}.
+
+
+%prep
+%setup -q 
+
+%patch1 -p1 -b .multilib
+%patch100 -p1 -b .version
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}   
+%cmake ..
+popd                        
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT 
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.LGPL
+%{_libdir}/libtag-extras.so.1*
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/taglib-extras-config
+%{_includedir}/taglib-extras/
+%{_libdir}/libtag-extras.so
+%{_libdir}/pkgconfig/taglib-extras.pc
+
+
+%changelog
+* Sun Oct 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-2
+- initial build for Vine Linux
+
+* Mon Sep 21 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.1-1
+- taglib-extras-1.0.1
+
+* Thu Sep 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.0-2
+- drop (deprecated/no-op) kde integration
+
+* Thu Sep 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.0-1
+- taglib-extras-1.0.0 (API/ABI bump)
+
+* Wed Sep 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1.7-1
+- taglib-extras-0.1.7
+
+* Mon Aug 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1.6-1
+- taglib-extras-0.1.6
+
+* Fri Jul 24 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1.5-1
+- taglib-extras-0.1.5
+
+* Fri Jun 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1.4-1
+- taglib-extras-0.1.4
+
+* Sat May 02 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1.3-1
+- taglib-extras-0.1.3
+
+* Thu Apr 07 2009 Eelko Berkenpies <fedora@berkenpies.nl> - 0.1.2-1
+- taglib-extras-0.1.2
+
+* Thu Mar 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1.1-2
+- enable KDE integration, -DWITH_KDE
+
+* Tue Mar 24 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1.1-1
+- taglib-extras-0.1.1
+
+* Tue Mar 24 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1-4
+- refetch tarball
+
+* Mon Mar 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1-3
+- -devel: Requires: taglib-devel
+- Source0: full URL
+
+* Mon Mar 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.1-2
+- fixup for review
+
+* Fri Mar 20 2009 Eelko Berkenpies <fedora@berkenpies.nl> - 0.1-1
+- initial package

+ 24 - 12
t/taglib/taglib-vl.spec

@@ -1,15 +1,20 @@
-Summary: TagLib Audio Meta-Data Library
 Name: taglib
-Version: 1.6.1
-Release: 2%{?_dist_release}
-License: LGPL/MPL
+Summary: TagLib Audio Meta-Data Library
+Version: 1.6.3
+Release: 1%{?_dist_release}
+
 Group: System Environment/Libraries
+License: LGPLv2
+URL: http://developer.kde.org/~wheeler/taglib.html
+
 Source: http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
 Patch0:	http://www.cc.rim.or.jp/~yaz/taglib-1.4_wchar.diff
-URL: http://developer.kde.org/~wheeler/taglib.html
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: zlib-devel
+Patch2: taglib-1.5rc1-multilib.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cmake >= 2.6.0
+BuildRequires: pkgconfig
+BuildRequires: zlib-devel
 
 %description
 TagLib is a library for reading and editing the meta-data of 
@@ -28,17 +33,19 @@ Libraries and header files required for TagLib development.
 %prep
 %setup -q
 %patch0 -p1 -b .wchar
+%patch2 -p1 -b .multilib
 
 %build
-mkdir %{name}-build
-pushd %{name}-build
-%cmake ..
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake -DWITH_ASF=1 -DWITH_MP4=1 ..
 popd
-make %{?_smp_mflags} -C %{name}-build
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT -C %{name}-build
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -63,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Oct 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.3-1
+- new upstream release
+- added build option for supporting ASF and MP4 files
+- added Patch2 from Fedora
+
 * Sat Oct 02 2010 Shu KONNO <owa@bg.wakwak.com> 1.6.1-2
 - rebuilt with rpm-4.8.1 for pkg-config