From 885a05f664889c23b6163d770a0c20535de27aeb Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Nov 08 2010 20:50:34 +0000 Subject: libXdmcp 1.1.0 --- diff --git a/.gitignore b/.gitignore index 8bcf1b7..e5028bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libXdmcp-1.0.3.tar.bz2 +/libXdmcp-1.1.0.tar.bz2 diff --git a/libXdmcp-1.0.2-namespace-pollution.patch b/libXdmcp-1.0.2-namespace-pollution.patch deleted file mode 100644 index cb4f4f0..0000000 --- a/libXdmcp-1.0.2-namespace-pollution.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- libXdmcp-1.0.2/Alloc.c.jx 2006-07-11 14:05:09.000000000 -0400 -+++ libXdmcp-1.0.2/Alloc.c 2006-11-20 15:28:25.000000000 -0500 -@@ -38,9 +38,10 @@ - #include - #include - #include -+#include - #include - --void * -+_X_HIDDEN void * - Xalloc (unsigned long amount) - { - if (amount == 0) -@@ -48,7 +49,7 @@ - return malloc (amount); - } - --void * -+_X_HIDDEN void * - Xrealloc (void *old, unsigned long amount) - { - if (amount == 0) -@@ -58,7 +59,7 @@ - return realloc ((char *) old, amount); - } - --void -+_X_HIDDEN void - Xfree (void *old) - { - if (old) diff --git a/libXdmcp.spec b/libXdmcp.spec index f62d944..9fa3e07 100644 --- a/libXdmcp.spec +++ b/libXdmcp.spec @@ -1,15 +1,15 @@ Summary: X Display Manager Control Protocol library Name: libXdmcp -Version: 1.0.3 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 BuildRequires: xorg-x11-proto-devel +BuildRequires: xmlto %description X Display Manager Control Protocol library. @@ -39,6 +39,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# manual fixup later +rm -rf $RPM_BUILD_ROOT%{_docdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -53,12 +56,15 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc README +%doc README doc/*.txt %{_includedir}/X11/Xdmcp.h %{_libdir}/libXdmcp.so %{_libdir}/pkgconfig/xdmcp.pc %changelog +* Mon Nov 08 2010 Adam Jackson 1.1.0-1 +- libXdmcp 1.1.0 + * Wed Oct 21 2009 Parag - 1.0.3-3 - Merge-Review #226068 - make is not verbose diff --git a/sources b/sources index 911cc5e..327acc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d60941d471800f41a3f19b24bea855a7 libXdmcp-1.0.3.tar.bz2 +762b6bbaff7b7d0831ddb4f072f939a5 libXdmcp-1.1.0.tar.bz2