packages: pwlib/pwlib.spec - resurrect proper spec rev

[arekm]

Author: arekm                        Date: Fri Jan 22 20:32:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resurrect proper spec rev

---- Files affected:
packages/pwlib:
   pwlib.spec (1.152 -> 1.153) 

---- Diffs:

================================================================
Index: packages/pwlib/pwlib.spec
diff -u packages/pwlib/pwlib.spec:1.152 packages/pwlib/pwlib.spec:1.153
--- packages/pwlib/pwlib.spec:1.152	Fri Jan 22 21:21:02 2010
+++ packages/pwlib/pwlib.spec	Fri Jan 22 21:32:29 2010
@@ -3,19 +3,19 @@
 # Conditional build:
 %bcond_with	dc1394		# build DC 1394 video input plugin
 %bcond_with	avc1394		# build AVC 1394 video input plugin
-#
+
+%define		ver	%(echo %{version} | tr . _)
 Summary:	Portable Windows Libary
 Summary(pl.UTF-8):	Biblioteka zapewniająca przenośność między Windows i Uniksami
 Summary(pt_BR.UTF-8):	Biblioteca Windows Portavel
 Name:		pwlib
-Version:	1.10.10
-Release:	7
+Version:	1.11.1
+Release:	2
 Epoch:		0
 License:	MPL 1.0
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/pwlib/1.10/%{name}-%{version}.tar.bz2
-# Source0-md5:	2c3bf7e8236a96659728ad139ce30b33
-#Source0:	http://www.voxgratia.org/releases/pwlib-v1_10_3-src-tar.gz
+Source0:	http://www.voxgratia.org/releases/%{name}-v%{ver}-src.tar.gz
+# Source0-md5:	8b7a7a2ed8da6792006922476dd3b2f3
 Patch0:		%{name}-mak_files.patch
 Patch1:		%{name}-libname.patch
 Patch2:		%{name}-bison-pure.patch
@@ -126,6 +126,19 @@
 %description sound-oss -l pl.UTF-8
 Wtyczka dźwiękowa OSS.
 
+%package sound-esd
+Summary:	ESD audio plugin
+Summary(pl.UTF-8):	Wtyczka dźwiękowa ESD
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Provides:	pwlib-sound
+
+%description sound-esd
+ESD audio plugin.
+
+%description sound-esd -l pl.UTF-8
+Wtyczka dźwiękowa ESD.
+
 %package video-avc
 Summary:	AVC 1394 video input plugin
 Summary(pl.UTF-8):	Wtyczka wejścia obrazu AVC 1394
@@ -175,7 +188,7 @@
 Wtyczka wejścia obrazu v4l2.
 
 %prep
-%setup -q
+%setup -q -n pwlib_v%{ver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -219,8 +232,8 @@
 	PWLIBMAKEDIR="$dir/make" \
 	PW_LIBDIR="$dir/lib" \
 
-cp -d lib/lib*.a $RPM_BUILD_ROOT%{_libdir}
-cp version.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -pd lib/lib*.a $RPM_BUILD_ROOT%{_libdir}
+cp -a version.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -261,6 +274,10 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/pwlib/devices/sound/oss_pwplugin.so
 
+%files sound-esd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/pwlib/devices/sound/esd_pwplugin.so
+
 %if %{with avc1394}
 %files video-avc
 %defattr(644,root,root,755)
@@ -287,11 +304,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.152  2010/01/22 20:21:02  arekm
-- rel 7; -devel conflicts with ptlib-devel, same for static
+Revision 1.153  2010/01/22 20:32:29  arekm
+- resurrect proper spec rev
 
-Revision 1.151  2010/01/22 20:18:20  arekm
-- readd
+Revision 1.149  2009/12/30 16:15:11  glen
+- up to 1.11.1; add -sound-esd package
 
 Revision 1.148  2008/09/13 12:51:30  hawk
 - added avc1394 bcond, disabled by default (avc video plugin uses obsolete
@@ -465,7 +482,7 @@
 - refetch dirctly form URL
 
 Revision 1.91  2004/03/22 22:17:10  aflinta
- - fetch source from dropin
+- fetch source from dropin
 
 Revision 1.90  2004/03/22 22:09:03  aflinta
 - up to version 1.6.5
@@ -641,9 +658,9 @@
 
 Revision 1.38  2002/04/06 22:45:00  mmazur
 - added a patch from gnomemeeting.org... Not one failed hunk, though
-I would wait till somebody really needs it - we are going stable aren't we :)
+  I would wait till somebody really needs it - we are going stable aren't we :)
 - NOTE: after rebuilding pwlib one needs to rebuild openh323 with the new
-pwlib for the changes to take effect
+  pwlib for the changes to take effect
 
 Revision 1.37  2002/04/05 19:56:54  mmazur
 - merged with DEVEL; updated to 1.2.13; rel1; STBR
@@ -653,7 +670,7 @@
 
 Revision 1.36.2.1  2002/03/25 20:27:14  mmazur
 - well... rel1 for version .13... STBR for NEST if you dare (should I
-add gcc2 to BR?)
+  add gcc2 to BR?)
 
 Revision 1.36  2002/03/14 17:51:17  martii
 -  EOF patch - ppc adapted
@@ -666,7 +683,7 @@
   Group field using gettext).
 
 Revision 1.33  2002/01/18 02:14:43  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.32  2002/01/17 02:41:01  kloczek
 - updated to 1.2.11 (bugfix release).
@@ -744,13 +761,13 @@
 - some typos
 
 Revision 1.9  2001/01/10 14:53:33  jajcus
-- %%{debug} switch handling fixed
+- %{debug} switch handling fixed
 
 Revision 1.8  2001/01/10 14:48:15  jajcus
 - Release: 3
 - library names changed (we don't need sytem type and such in library name)
 - *.mak files changed so apps compilations won't try to build pwlib
-- %%{debug} macro used together with pwlib's building system
+- %{debug} macro used together with pwlib's building system
 - only dynamically-linked version of asnparser is built
 
 Revision 1.7  2001/01/08 09:50:13  kloczek
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pwlib/pwlib.spec?r1=1.152&r2=1.153&f=u