Hello community,

here is the log from the commit of package libpt2 for openSUSE:Factory
checked in at Wed Jul 6 16:22:20 CEST 2011.



--------
--- libpt2/libpt2.changes       2010-10-14 10:26:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/libpt2/libpt2.changes  2011-07-06 
12:01:13.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Jul  6 09:55:14 UTC 2011 - dims...@opensuse.org
+
+- Disable build of v4l plugin on openSUSE 12.1+, based on
+  build_v4l define, we change the spec:
+  + Conditionally pass --enable-v4l to configure
+  + Obsolete libpt%{_version}-plugins-v4l
+  + Do not create the libpt%{_version}-plugins-v4l subpackage.
+- Stop using source services, as Factory is moving away from it.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  _service
  _service:download_url:ptlib-2.6.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libpt2.spec ++++++
--- /var/tmp/diff_new_pack.EROOdA/_old  2011-07-06 16:21:53.000000000 +0200
+++ /var/tmp/diff_new_pack.EROOdA/_new  2011-07-06 16:21:53.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package libpt2 (Version 2.6.7)
+# spec file for package libpt2
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,11 +18,13 @@
 
 %define build_avc 0
 %define build_dc 0
+# Video4Linux is obsolete on Kernel 3.0, which we have after openSUSE 11.4
+%define build_v4l 0%{?suse_version} <= 1140
 
 Name:           libpt2
 %define _name   ptlib
 Version:        2.6.7
-Release:        3
+Release:        9
 # FIXME: when upgrading, check if the dc plugin builds with the current 
version of libdc1394
 %define _version 2_6_7
 License:        MPLv1.0
@@ -49,7 +51,9 @@
 BuildRequires:  libdv-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libstdc++-devel
+%if %{?build_v4l}
 BuildRequires:  libv4l-devel
+%endif
 BuildRequires:  openldap2-devel
 BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -61,12 +65,17 @@
 
 %package -n libpt%{_version}
 
+
 License:        MPLv1.0
 Summary:        Portable Windows Library from Equivalence Pty. Ltd. version 2
 Group:          System/Libraries
 # This used to be a subpackage
 Provides:       libpt2-plugins-v4l2 = %{version}
 Obsoletes:      libpt2-plugins-v4l2 < %{version}
+# After openSUSE 11.4, there is no more v4l available. We obsolete it to ease 
upgrades
+%if ! (%{build_v4l})
+Obsoletes:      libpt%{_version}-plugins-v4l <= %{version}
+%endif
 %if ! %{build_avc}
 Obsoletes:      libpt%{_version}-plugins-avc <= %{version}
 %endif
@@ -95,6 +104,7 @@
 
 %package -n libpt%{_version}-plugins-esd
 
+
 License:        MPLv1.0
 Summary:        ESD plugin for %{name}
 Group:          System/Libraries
@@ -110,6 +120,7 @@
 
 %package -n libpt%{_version}-plugins-avc
 
+
 License:        MPLv1.0
 Summary:        AVC plugin for %{name}
 Group:          System/Libraries
@@ -128,6 +139,7 @@
 
 %package -n libpt%{_version}-plugins-dc
 
+
 License:        MPLv1.0
 Summary:        DC plugin for %{name}
 Group:          System/Libraries
@@ -142,8 +154,11 @@
 for %{name}.
 %endif
 
+%if %{build_v4l}
+
 %package -n libpt%{_version}-plugins-v4l
 
+
 License:        MPLv1.0
 Summary:        V4L support for %{name}
 Group:          System/Libraries
@@ -153,6 +168,7 @@
 %description -n libpt%{_version}-plugins-v4l
 This plugin enables 'video for linux' (version 1) support (e.g. for USB
 cameras) for %{name}.
+%endif
 
 %prep
 %setup -q -n %{_name}-%{version}
@@ -163,7 +179,9 @@
 %configure \
        --enable-esd \
        --enable-oss \
+%if %{build_v4l}
        --enable-v4l \
+%endif
        --enable-avc
 make %{?_smp_mflags} V=1
 
@@ -220,8 +238,11 @@
 %{_libdir}/%{_name}-%{version}/devices/videoinput/dc_pwplugin.so
 %endif
 
+%if %{build_v4l}
+
 %files -n libpt%{_version}-plugins-v4l
 %defattr(-,root,root)
 %{_libdir}/%{_name}-%{version}/devices/videoinput/v4l_pwplugin.so
+%endif
 
 %changelog


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to