diff --git a/.cvsignore b/.cvsignore index 1bf10a8..3ac35ce 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lash-0.5.1.tar.gz +lash-0.5.3.tar.gz diff --git a/lash-0.5.1-no-rpath.patch b/lash-0.5.1-no-rpath.patch deleted file mode 100644 index e6422cb..0000000 --- a/lash-0.5.1-no-rpath.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- lash-1.0.pc.in~ 2005-09-12 22:02:19.000000000 -0700 -+++ lash-1.0.pc.in 2006-05-30 15:44:14.000000000 -0700 -@@ -7,5 +7,5 @@ - Description: Audio session management - Requires: jack alsa - Version: @PACKAGE_VERSION@ --Libs: -Wl,--rpath -Wl,${libdir} -L${libdir} -llash -lpthread -luuid -+Libs: -L${libdir} -llash -lpthread -luuid - Cflags: -I${includedir}/lash-1.0 diff --git a/lash-0.5.1-service.patch b/lash-0.5.1-service.patch deleted file mode 100644 index 4b6d764..0000000 --- a/lash-0.5.1-service.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- lash-0.5.1-orig/lashd/conn_mgr.c 2005-10-01 23:09:29.000000000 -0700 -+++ lash-0.5.1/lashd/conn_mgr.c 2006-05-07 15:21:55.000000000 -0700 -@@ -187,6 +187,12 @@ - - err = getaddrinfo(NULL, "lash", &hints, &addrs); - if (err) { -+ char* lashserv[256]; -+ sprintf(lashserv, "%d", LASH_DEFAULT_PORT); -+ hints.ai_flags |= AI_NUMERICSERV; -+ err = getaddrinfo (NULL, lashserv, &hints, &addrs); -+ } -+ if (err) { - fprintf(stderr, "%s: could not look up service name: %s\n", - __FUNCTION__, gai_strerror(err)); - return -1; ---- lash-0.5.1-orig/liblash/comm.c 2005-09-15 01:15:30.000000000 -0700 -+++ lash-0.5.1/liblash/comm.c 2006-05-07 15:22:20.000000000 -0700 -@@ -135,7 +135,12 @@ - lash_comm_event_t connect_event; - int err; - -- err = lash_open_socket(&client->socket, server, "lash"); -+ err = lash_open_socket(&client->socket, server, "lash", 0); -+ if (err) { -+ char* lashserv[256]; -+ sprintf(lashserv, "%d", LASH_DEFAULT_PORT); -+ err = lash_open_socket(&client->socket, server, lashserv, 1); -+ } - if (err) { - fprintf(stderr, "%s: could not create server connection\n", - __FUNCTION__); ---- lash-0.5.1-orig/liblash/socket.c 2005-10-03 20:26:41.000000000 -0700 -+++ lash-0.5.1/liblash/socket.c 2006-05-07 14:55:25.000000000 -0700 -@@ -154,7 +154,7 @@ - } - - int --lash_open_socket(int *sockptr, const char *host, const char *service) -+lash_open_socket(int *sockptr, const char *host, const char *service, int numericserv) - { - struct addrinfo hints; - struct addrinfo *addrs; -@@ -168,6 +168,7 @@ - - memset(&hints, 0, sizeof(hints)); - hints.ai_socktype = SOCK_STREAM; -+ hints.ai_flags = (numericserv == 0)? 0 : AI_NUMERICSERV; - - err = getaddrinfo(host, service, &hints, &addrs); - if (err) { ---- lash-0.5.1-orig/lash/socket.h 2005-09-12 22:02:18.000000000 -0700 -+++ lash-0.5.1/lash/socket.h 2006-05-07 14:55:25.000000000 -0700 -@@ -26,7 +26,7 @@ - int lash_recvall (int socket, void ** bufptr, size_t * buf_size, int flags); - - /* returns 0 on success, non-0 on error */ --int lash_open_socket (int * socket, const char * host, const char * service); -+int lash_open_socket (int * socket, const char * host, const char * service, int numericserv); - - /* return hostname on success, or NULL on error */ - const char * lash_lookup_peer_name (int sock); diff --git a/lash-0.5.1-texi-dir.patch b/lash-0.5.1-texi-dir.patch deleted file mode 100644 index 7f2a054..0000000 --- a/lash-0.5.1-texi-dir.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- docs/lash-manual.texi~ 2006-03-24 16:48:53.000000000 -0800 -+++ docs/lash-manual.texi 2006-05-30 16:09:41.000000000 -0700 -@@ -4,6 +4,14 @@ - @settitle LASH Audio Session Handler - @c %**end of header - -+@ifinfo -+@format -+@dircategory Miscellaneous -+@direntry -+* LASH: (lash-manual). The LASH Audio Session Handler Reference Manual -+@end direntry -+@end format -+@end ifinfo - - @ifinfo - This is the LASH Audio Session Handler Reference Manual, diff --git a/lash-0.5.3-no-static-lib.patch b/lash-0.5.3-no-static-lib.patch new file mode 100644 index 0000000..54d1cd7 --- /dev/null +++ b/lash-0.5.3-no-static-lib.patch @@ -0,0 +1,10 @@ +--- lash-1.0.pc.in~ 2007-10-07 06:33:27.000000000 -0700 ++++ lash-1.0.pc.in 2007-10-07 06:35:00.000000000 -0700 +@@ -7,6 +7,5 @@ + Description: Audio session management + Requires: @PC_REQUIRES@ + Version: @PACKAGE_VERSION@ +-Libs: -llash +-Libs.static: -lpthread -luuid ++Libs: -llash -lpthread -luuid + Cflags: -I${includedir}/lash-1.0 diff --git a/lash.spec b/lash.spec index 8f91490..114b983 100644 --- a/lash.spec +++ b/lash.spec @@ -1,19 +1,18 @@ Summary: LASH Audio Session Handler Name: lash -Version: 0.5.1 -Release: 15%{?dist} +Version: 0.5.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.nongnu.org/lash/ Source0: http://download.savannah.gnu.org/releases/lash/lash-%{version}.tar.gz -Patch0: lash-0.5.1-service.patch -Patch1: lash-0.5.1-no-rpath.patch -Patch2: lash-0.5.1-texi-dir.patch +Patch0: lash-0.5.3-no-static-lib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel, e2fsprogs-devel, gtk2-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: libxml2-devel, readline-devel, texi2html +BuildRequires: python-devel swig Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -34,11 +33,20 @@ Requires: pkgconfig %description devel Development files for the LASH library. +%package python +Summary: Python wrapper for LASH +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: jack-audio-connection-kit-devel alsa-lib-devel e2fsprogs-devel +Requires: python + +%description python +Contains Python language bindings for developing Python applications that +use LASH. + %prep %setup -q -%patch0 -p1 -%patch1 -p0 -%patch2 -p0 +%patch0 -p0 %build %configure --disable-static --disable-serv-inst @@ -92,8 +100,6 @@ desktop-file-install --vendor fedora \ rm -rf %{buildroot} %post -/sbin/install-info %{_infodir}/%{name}-manual.info.gz %{_infodir}/dir \ - --entry="* lash-manual: (lash-manual). LASH Audio Session Handler." /sbin/ldconfig # update icon themes touch %{_datadir}/icons/hicolor @@ -110,20 +116,12 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi -%preun -if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}-manual.info.gz %{_infodir}/dir \ - --entry="* lash-manual: (lash-manual). LASH Audio Session Handler." -fi -exit 0 - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README docs/lash-manual-html-split/lash-manual icons/lash.xcf %{_bindir}/lash* -%{_libdir}/liblash.so.2 -%{_libdir}/liblash.so.2.* -%{_infodir}/lash* +%{_libdir}/liblash.so.1 +%{_libdir}/liblash.so.1.* %{_datadir}/icons/hicolor/16x16/apps/lash.png %{_datadir}/icons/hicolor/24x24/apps/lash.png %{_datadir}/icons/hicolor/48x48/apps/lash.png @@ -138,7 +136,16 @@ exit 0 %{_includedir}/lash-1.0 %{_libdir}/pkgconfig/lash* +%files python +%defattr(-,root,root,0755) +%{_libdir}/python2.5/site-packages/* + %changelog +* Sun Oct 07 2007 Anthony Green 0.5.3-1 +- Upgrade sources. +- Don't install info files (no longer built). +- Add python package. + * Wed Aug 29 2007 Fedora Release Engineering - 0.5.1-15 - Rebuild for selinux ppc32 issue. diff --git a/sources b/sources index 27158be..27559b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -926c87cf7da8e5077ffe29208fec34e7 lash-0.5.1.tar.gz +a9ed9f839a191ba7fd4b376b9cb24f31 lash-0.5.3.tar.gz