[x11vnc] Update to 0.9.13 version (asked in bz#669780) Drop x11vnc-0.9.8-XShm-explicit-include.patch

Pavel Alexeev hubbitus at fedoraproject.org
Sun Dec 11 14:42:54 UTC 2011


commit c23f94c7837b01072cf181d989ad35ca5370aadf
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Sun Dec 11 18:42:51 2011 +0400

    Update to 0.9.13 version (asked in bz#669780)
    Drop x11vnc-0.9.8-XShm-explicit-include.patch

 .gitignore  |    2 ++
 sources     |    3 ++-
 x11vnc.spec |   16 +++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a450233..831b56c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 x11vnc-0.9.8.tar.gz
 /x11vnc-0.9.12.tar.gz
+/x11vnc-0.9.13.tar.gz
+/x11vnc-0.9.8-disableRpath.patch
diff --git a/sources b/sources
index efb142c..5dc8bb9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-1498a68d02aa7b6c97bf746c073c8d00  x11vnc-0.9.12.tar.gz
+a372ec4fe8211221547b1c108cf56e4c  x11vnc-0.9.13.tar.gz
+6ace0b145956b6c7d65290d88e92e5f7  x11vnc-0.9.8-disableRpath.patch
diff --git a/x11vnc.spec b/x11vnc.spec
index 6c33c3c..e0dc392 100644
--- a/x11vnc.spec
+++ b/x11vnc.spec
@@ -1,8 +1,8 @@
 Summary:		VNC server for the current X11 session
 Summary(ru):	VNC-сервер для текущей сессии X11
 Name:		x11vnc
-Version:		0.9.12
-Release:		18%{?dist}
+Version:		0.9.13
+Release:		1%{?dist}
 License:		GPLv2
 Group:		User Interface/X
 URL:			http://www.karlrunge.com/x11vnc/
@@ -26,8 +26,6 @@ Requires:		Xvfb
 
 # Fedora don't want hardcoded rpaths.
 Patch1:		x11vnc-0.9.8-disableRpath.patch
-# According to new paths add new include to build. I think it is Fedora-related.
-Patch2:		x11vnc-0.9.8-XShm-explicit-include.patch
 
 # Package intended to EL-5 too, so we still need define BuildRoot
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -84,10 +82,6 @@ Java-клиенты для использования совместно с %{na
 %setup -q
 %patch1 -p0 -b .rpath
 
-%if 0%{?fedora} > 11
-%patch2 -p0 -b .XShm
-%endif
-
 # fix source perms for the -debuginfo package rpmlint warnings
 find -name "*.c" -o -name "*.h" -exec %{__chmod} 0644 {} \;
 
@@ -95,7 +89,7 @@ for file in README AUTHORS; do
 	# ISO-8859-1 is my assumption.
 	iconv -f ISO-8859-1 -t UTF-8 "$file" > "$file.new"
 	touch --reference "$file" "$file.new"
-	%{__mv} "$file.new" "$file"
+	mv "$file.new" "$file"
 done
 
 # Delete prebuilt binaries
@@ -155,6 +149,10 @@ popd
 %endif
 
 %changelog
+* Sun Dec 11 2011 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9.13-1
+- Update to 0.9.13 version (asked in bz#669780)
+- Drop x11vnc-0.9.8-XShm-explicit-include.patch
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.12-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list