From fe9df8288a9f88ddd93882eb5779ec45f60c582c Mon Sep 17 00:00:00 2001 From: green Date: Jun 25 2006 18:28:06 +0000 Subject: auto-import lash-0.5.1-5 on branch devel from lash-0.5.1-5.src.rpm --- diff --git a/.cvsignore b/.cvsignore index e69de29..1bf10a8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +lash-0.5.1.tar.gz diff --git a/lash-0.5.1-no-rpath.patch b/lash-0.5.1-no-rpath.patch new file mode 100644 index 0000000..e6422cb --- /dev/null +++ b/lash-0.5.1-no-rpath.patch @@ -0,0 +1,9 @@ +--- 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 new file mode 100644 index 0000000..4b6d764 --- /dev/null +++ b/lash-0.5.1-service.patch @@ -0,0 +1,61 @@ +--- 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 new file mode 100644 index 0000000..aa95950 --- /dev/null +++ b/lash-0.5.1-texi-dir.patch @@ -0,0 +1,16 @@ +--- 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,13 @@ + @settitle LASH Audio Session Handler + @c %**end of header + ++@ifinfo ++@format ++START-INFO-DIR-ENTRY ++* LASH: (lash-manual). The LASH Audio Session Handler Reference Manual ++END-INFO-DIR-ENTRY ++@end format ++@end ifinfo + + @ifinfo + This is the LASH Audio Session Handler Reference Manual, diff --git a/lash.spec b/lash.spec new file mode 100644 index 0000000..4a28210 --- /dev/null +++ b/lash.spec @@ -0,0 +1,194 @@ +Summary: LASH Audio Session Handler +Name: lash +Version: 0.5.1 +Release: 5%{?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 +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 + +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info + +BuildRequires: desktop-file-utils + +%description +LASH is a session management system for JACK and ALSA audio +applications on GNU/Linux. + +%package devel +Summary: Development files for LASH +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: jack-audio-connection-kit-devel alsa-lib-devel + +%description devel +Development files for the LASH library. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p0 +%patch2 -p0 + +%build +%configure --disable-static --disable-serv-inst +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_sysconfdir} +make DESTDIR=%{buildroot} install +rm -f %{buildroot}%{_infodir}/dir +rm -f %{buildroot}%{_libdir}/liblash.la + +# Move icons to the right place +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/24x24/apps +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/96x96/apps +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps +mv %{buildroot}%{_datadir}/lash/icons/lash_16px.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/lash.png +mv %{buildroot}%{_datadir}/lash/icons/lash_24px.png %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/lash.png +mv %{buildroot}%{_datadir}/lash/icons/lash_48px.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/lash.png +mv %{buildroot}%{_datadir}/lash/icons/lash_96px.png %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/lash.png +mv %{buildroot}%{_datadir}/lash/icons/lash.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/lash.svg + +# Move the dtd file to our Fedora Friendly place +mkdir -p %{buildroot}%{_datadir}/xml/lash/dtds +mv %{buildroot}%{_datadir}/lash/dtds/lash-project-1.0.dtd %{buildroot}%{_datadir}/xml/lash/dtds + +# This directory is empty! +rm -rf %{buildroot}%{_datadir}/lash + +# install the desktop entry +cat << EOF > %{name}-panel.desktop +[Desktop Entry] +Name=LASH Panel +Comment=LASH Panel +Icon=lash.png +Exec=%{_bindir}/lash_panel +Terminal=false +Type=Application +EOF +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install --vendor fedora \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --add-category X-Fedora \ + --add-category AudioVideo \ + --add-category Application \ + %{name}-panel.desktop + +%clean +rm -rf %{buildroot} + +%post +/sbin/install-info %{_infodir}/%{name}-manual.info %{_infodir}/dir || : +/sbin/ldconfig +# update icon themes +touch %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun +/sbin/ldconfig +# update icon themes +touch %{_datadir}/icons/hicolor +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 %{_infodir}/dir || : +fi + +%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* +%{_datadir}/icons/hicolor/16x16/apps/lash.png +%{_datadir}/icons/hicolor/24x24/apps/lash.png +%{_datadir}/icons/hicolor/48x48/apps/lash.png +%{_datadir}/icons/hicolor/96x96/apps/lash.png +%{_datadir}/icons/hicolor/scalable/apps/lash.svg +%{_datadir}/xml/lash +%{_datadir}/applications/*%{name}-panel.desktop + +%files devel +%defattr(-,root,root,-) +%{_libdir}/liblash.so +%{_includedir}/lash-1.0 +%{_libdir}/pkgconfig/lash* + +%changelog +* Sun Jun 26 2006 Anthony Green 0.5.1-5 +- Use || : is %post(un) scripts. + +* Sun Jun 26 2006 Anthony Green 0.5.1-4 +- Fix files reference to %{_datadir}/xml/lash. +- Don't use update-desktop-database. +- Use %{version} in Source0. + +* Mon Jun 19 2006 Anthony Green 0.5.1-3 +- Fix changelog entries. +- Move pkgconfig file to devel package. +- Run ldconfig is post and postun. +- Clean up BuildRequires. +- Fix docs install. +- Move icons to correct directory. +- Move dtds to correct directory. +- Don't install INSTALL or TODO. +- Install desktop file. + +* Tue May 30 2006 Anthony Green 0.5.1-2 +- Fix URL. +- Add lash-0.5.1-service.patch. +- Fix some BuildRequires. +- The devel package Requires things now. +- Use %{_infodir}. +- Delete the texinfo dir file. +- Add -texi-dir patch. +- Install info files properly. +- Add Fernando Lopez-Lazcano's -service.patch. +- Delete .la file after installation. +- Configure with --disable-serv-inst. + +* Tue Apr 18 2006 Anthony Green 0.5.1-1 +- Build for Fedora Extras. + +* Mon May 30 2005 Fernando Lopez-Lezcano +- remove references to deprecated function jack_set_server_dir in + jack (patch4), fc4 test build, no release bump yet +* Sun Dec 19 2004 Fernando Lopez-Lezcano +- spec file cleanup +* Thu May 20 2004 Fernando Lopez-Lezcano +- aded tetex buildrequires +* Sat May 8 2004 Fernando Lopez-Lezcano +- added buildrequires +- add patch to not add service to /etc/services +* Tue Feb 24 2004 Fernando Lopez-Lezcano 0.4.0-2 +- added patch (thanks to Guenter Geiger) to not require a service number + entry in /etc/services +* Fri Nov 14 2003 Fernando Lopez-Lezcano 0.4.0-1 +- spec file tweaks +* Thu Nov 6 2003 Fernando Lopez-Lezcano 0.4.0-1 +- updated to 0.4.0 +- patched to build under gcc2.96 (patch1) +* Wed Feb 11 2003 Fernando Lopez-Lezcano 0.3.0-1 +- updated to 0.3.0 +- added 7.2 workaround for gtk2 configuration problem +* Mon Jan 13 2003 Fernando Lopez-Lezcano 0.2-1 +- Initial build. diff --git a/sources b/sources index e69de29..27158be 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +926c87cf7da8e5077ffe29208fec34e7 lash-0.5.1.tar.gz