Author: jajcus                       Date: Thu Apr 28 13:39:47 2011 GMT
Module: packages                      Tag: PTLIB_2_8
---- Log message:
- Epoch: 1
- warning about version compatibility
- fixed the way video-avc codec is disabled (it seems it was commented out and
  then mangled by the adapter script)

---- Files affected:
packages/ptlib:
   ptlib.spec (1.25.2.2 -> 1.25.2.3) 

---- Diffs:

================================================================
Index: packages/ptlib/ptlib.spec
diff -u packages/ptlib/ptlib.spec:1.25.2.2 packages/ptlib/ptlib.spec:1.25.2.3
--- packages/ptlib/ptlib.spec:1.25.2.2  Thu Apr 28 13:21:03 2011
+++ packages/ptlib/ptlib.spec   Thu Apr 28 15:39:42 2011
@@ -1,5 +1,15 @@
 # $Revision$, $Date$
 #
+# Warning: OPAL and Ekiga are very fragile to ptlib version changes
+#      even if they compile with newer ptlib that recommended
+#      things may not work properly. Do not upgrade without testing!
+#
+#      Recommended versions for Ekiga can be found at:
+#              http://wiki.ekiga.org/index.php/Download_Ekiga_sources
+#
+#      As for 2011-04-28 ptlib-2.6.x is recommended for for stable ekiga (3.2)
+#      but it seems to work with ptlib-2.8 too.
+#
 # Conditional build:
 %bcond_without http            # Disable http support
 %bcond_without ipv6            # Disable ipv6 support
@@ -14,6 +24,7 @@
 Name:          ptlib
 Version:       2.8.3
 Release:       1
+Epoch:         1
 URL:           http://www.opalvoip.org/
 Source0:       
http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
 # Source0-md5: 0293a9029fe4164bb63ff8ca15db8703
@@ -64,7 +75,7 @@
 Summary:       PTLib (Portable Tools Library) development files
 Summary(pl.UTF-8):     PTLib pliki deweloperskie
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 
 %description devel
@@ -90,7 +101,7 @@
 Summary:       Alsa audio plugin
 Summary(pl.UTF-8):     Alsa wtyczka audio
 Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      %{name}-sound
 
 %description sound-alsa
@@ -103,7 +114,7 @@
 Summary:       Pulse audio plugin
 Summary(pl.UTF-8):     Pulse wtyczka audio
 Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      %{name}-sound
 
 %description sound-pulse
@@ -116,7 +127,7 @@
 Summary:       OSS audio plugin
 Summary(pl.UTF-8):     OSS wtyczka audio
 Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      %{name}-sound
 
 %description sound-oss
@@ -129,7 +140,7 @@
 Summary:       v4l video input plugin
 Summary(pl.UTF-8):     v4l wejściowa wtyczka wideo
 Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description video-v4l
 v4l video input plugin.
@@ -141,7 +152,7 @@
 Summary:       v4l2 video input plugin
 Summary(pl.UTF-8):     v4l2 wejściowa wtyczka wideo
 Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}%{version}-%{release}
 
 %description video-v4l2
 v4l2 video input plugin.
@@ -149,9 +160,13 @@
 %description video-v4l2 -l pl.UTF-8
 v4l2 wejściowa wtyczka wideo.
 
-#%package video-avc #Summary: AVC 1394 video input plugin #Group:
-Libraries #Requires: %{name} = %{version}-%{release} # #%description
-video-avc #AVC 1394 video input plugin.
+%package video-avc 
+Summary: AVC 1394 video input plugin 
+Group: Libraries 
+Requires: %{name} = %{epoch}%{version}-%{release}
+
+%description video-avc 
+AVC 1394 video input plugin.
 
 %prep
 %setup -q
@@ -276,9 +291,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) 
%{_libdir}/%{name}-%{version}/devices/videoinput/v4l2_pwplugin.so
 
-#%files video-avc
-#%defattr(644,root,root,755)
-#%attr(755,root,root) 
%{_libdir}/%{name}-%{version}/devices/videoinput/avc_pwplugin.so
+%if 0
+%files video-avc
+%defattr(644,root,root,755)
+%attr(755,root,root) 
%{_libdir}/%{name}-%{version}/devices/videoinput/avc_pwplugin.so
+%endif
 %endif
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -287,6 +304,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25.2.3  2011/04/28 13:39:42  jajcus
+- Epoch: 1
+- warning about version compatibility
+- fixed the way video-avc codec is disabled (it seems it was commented out and
+  then mangled by the adapter script)
+
 Revision 1.25.2.2  2011/04/28 11:21:03  jajcus
 - use std:allocator instead of some internal GCC API (which crashes ptlib apps
   with our GCC/libstdc++)
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ptlib/ptlib.spec?r1=1.25.2.2&r2=1.25.2.3&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to