Hello community,
here is the log from the commit of package xorg-x11-proto-devel for
openSUSE:Factory checked in at 2012-03-02 13:50:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-proto-devel (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-proto-devel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-proto-devel", Maintainer is "sndir...@suse.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xorg-x11-proto-devel/xorg-x11-proto-devel.changes
2012-02-10 17:21:30.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xorg-x11-proto-devel.new/xorg-x11-proto-devel.changes
2012-03-02 13:50:37.000000000 +0100
@@ -1,0 +2,10 @@
+Sat Feb 25 20:55:52 UTC 2012 - giecr...@stegny.2a.pl
+
+- excluded VNC (no license, no upstream)
+ It will break libvnc, which is however not needed by any package and also
contains bogus attribution.
+ If in doubt, vncproto could be moved there.
+- disabled Provides: pkgconfig; to be reverted if the build loop returns and
cannot be broken by other means
+- singled out xcb-python, as recommended by policy
+- improved metadata and documentation
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.2fvigB/_old 2012-03-02 13:50:40.000000000 +0100
+++ /var/tmp/diff_new_pack.2fvigB/_new 2012-03-02 13:50:40.000000000 +0100
@@ -15,22 +15,28 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# No README, pretending to be from X.Org
+%bcond_with VNC
+%define xproto xproto-7.0.22
+%define xcbp xcb-proto-1.7
+%define vncp vncproto-20070501
Name: xorg-x11-proto-devel
BuildRequires: automake
BuildRequires: fdupes
BuildRequires: pkg-config
BuildRequires: python-base
+BuildRequires: pkgconfig(xorg-macros) xmlto
# manual provides to avoid dependency loop
-Provides: pkgconfig(applewmproto) pkgconfig(bigreqsprot)
pkgconfig(compositeproto) pkgconfig(damageproto) pkgconfig(dmxproto)
pkgconfig(dri2proto) pkgconfig(evieext) pkgconfig(fixesproto)
pkgconfig(fontcacheproto) pkgconfig(fontsproto) pkgconfig(glproto)
pkgconfig(inputproto) pkgconfig(kbproto) pkgconfig(libpthread-stubs)
pkgconfig(printproto) pkgconfig(randrproto) pkgconfig(recordproto)
pkgconfig(renderproto) pkgconfig(resourceproto) pkgconfig(scrnsaveproto)
pkgconfig(trapproto) pkgconfig(util-macros) pkgconfig(videoproto)
pkgconfig(vncproto) pkgconfig(windowswmproto) pkgconfig(xcb-proto)
pkgconfig(xcliplistproto) pkgconfig(xcmiscproto) pkgconfig(x86bigfontproto)
pkgconfig(xf86dgaproto) pkgconfig(xf86driproto) pkgconfig(xf86miscproto)
pkgconfig(xf86rushproto) pkgconfig(xf86vidmodeproto) pkgconfig(xineramaproto)
pkgconfig(xproto) pkgconfig(xproxymanagementprotocol)
+# Provides: pkgconfig(applewmproto) pkgconfig(bigreqsprot)
pkgconfig(compositeproto) pkgconfig(damageproto) pkgconfig(dmxproto)
pkgconfig(dri2proto) pkgconfig(evieext) pkgconfig(fixesproto)
pkgconfig(fontcacheproto) pkgconfig(fontsproto) pkgconfig(glproto)
pkgconfig(inputproto) pkgconfig(kbproto) pkgconfig(libpthread-stubs)
pkgconfig(printproto) pkgconfig(randrproto) pkgconfig(recordproto)
pkgconfig(renderproto) pkgconfig(resourceproto) pkgconfig(scrnsaveproto)
pkgconfig(trapproto) pkgconfig(util-macros) pkgconfig(videoproto)
pkgconfig(vncproto) pkgconfig(windowswmproto) pkgconfig(xcb-proto)
pkgconfig(xcliplistproto) pkgconfig(xcmiscproto) pkgconfig(x86bigfontproto)
pkgconfig(xf86dgaproto) pkgconfig(xf86driproto) pkgconfig(xf86miscproto)
pkgconfig(xf86rushproto) pkgconfig(xf86vidmodeproto) pkgconfig(xineramaproto)
pkgconfig(xproto) pkgconfig(xproxymanagementprotocol)
Url: http://xorg.freedesktop.org/
Version: 7.6
Release: 0
License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
-Summary: Include Files and Libraries mandatory for X11 Development
+Summary: Header files and Libraries mandatory for X11 Development
Source0: applewmproto-1.4.1.tar.bz2
Source1: bigreqsproto-1.1.1.tar.bz2
Source2: compositeproto-0.4.2.tar.bz2
@@ -61,57 +67,62 @@
Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2
Source28: xf86vidmodeproto-2.3.tar.bz2
Source29: xineramaproto-1.2.tar.bz2
-Source30: xproto-7.0.22.tar.bz2
+Source30: %{xproto}.tar.bz2
Source31: xproxymanagementprotocol-1.0.3.tar.bz2
Source32: evieext-1.1.0.tar.bz2
-Source33: xcb-proto-1.7.tar.bz2
+Source33: %{xcbp}.tar.bz2
Source34: libpthread-stubs-0.3.tar.bz2
-Source35: vncproto-20070501.tar.bz2
+%if %{with VNC}
+Source35: %{vncp}.tar.bz2
+%endif
Source36: xcliplistproto-20070501.tar.bz2
Source37: dri2proto-2.6.tar.bz2
-Requires: glibc-devel python-base = %{py_ver}
+Requires: glibc-devel python-xcb-proto-devel = %{version}
%description
-This package contains all necessary include files and libraries needed
-to develop X11 applications that require these.
-
-
+Header files and libraries needed
+to communicate directly with X server and extensions,
+including the XML-XCB extension, a full replacement for the original protocol.
+
+%package -n python-xcb-proto-devel
+Summary: Python libraries mandatory for XML-XCB Development
+Requires: python-base = %{py_ver}
+
+%description -n python-xcb-proto-devel
+Language-independent Python
+libraries that used to parse an XML description and create objects
+used by Python code generators in individual language bindings.
-Authors:
---------
-
- Bob Scheifler
- Dave Rosenthal
- Jim Gettys
- Keith Packard
- Phil Karlton
- Raymond Drewry
- Ron Newman
- Scott McGregor
- Susan Angebrandt
- Todd Newman
%prep
%setup -T -c %{name}
-for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
+for i in "$RPM_SOURCE_DIR"/*.tar.bz2
+do
+%if %{without VNC}
+[[ "$i" == "$RPM_SOURCE_DIR"/%{vncp}.tar.bz2 ]] ||
+%endif
+tar xjf $i
+done
+mkdir XML-XCB
+ln -tXML-XCB %{xcbp}/COPYING %{xcbp}/README %{xcbp}/NEWS
%build
-
-%install
-pushd util-macros-*
- #autoreconf -fi
- ./configure --prefix=/usr --libdir=%{_libdir}
- make
- make install DESTDIR=$RPM_BUILD_ROOT
-popd
-export ACLOCAL="aclocal --force -I /usr/share/aclocal -I
$RPM_BUILD_ROOT/usr/share/aclocal"
-for dir in $(ls */configure.ac); do
- pushd $(dirname $dir)
- echo $dir | grep -q -E "vncproto|xcliplistproto|xcb-proto" && autoreconf
-fi
+export ACLOCAL="aclocal --force -I /usr/share/aclocal"
+for ac in */configure.ac
+do dir="${ac%/*}"
+ pushd "${dir}"
+ [[ "${dir}" = vncproto || "${dir}" = xcliplistproto || "${dir}" = xcb-proto
]] && autoreconf -fi
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--prefix=/usr --libdir=%{_libdir}
make
- make install DESTDIR=$RPM_BUILD_ROOT
+ popd
+done
+
+%install
+for ac in */Makefile
+do dir="${ac%/*}"
+ pushd "${dir}"
+ make install "DESTDIR=$RPM_BUILD_ROOT"
popd
done
rm -f $RPM_BUILD_ROOT/usr/share/util-macros/INSTALL
@@ -144,14 +155,19 @@
/usr/include/X11/dri/*.h
/usr/include/X11/extensions/*.h
/usr/include/X11/fonts/*.h
+/usr/%{_lib}/pkgconfig/*.pc
+/usr/share/pkgconfig/*.pc
+/usr/share/aclocal/*.m4
+/usr/share/xcb/
+%doc %{xproto}/COPYING %{xproto}/AUTHORS XML-XCB %{xcbp}/doc/xml-xcb.txt
+
+%files -n python-xcb-proto-devel
+%defattr(-,root,root)
%if %suse_version > 1110
%python_sitelib/xcbgen/
%else
/usr/%{_lib}/python2.6/site-packages/xcbgen/
%endif
-/usr/%{_lib}/pkgconfig/*.pc
-/usr/share/pkgconfig/*.pc
-/usr/share/aclocal/*.m4
-/usr/share/xcb/
+%doc %{xcbp}/COPYING
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
