[xorg-x11-xfwp] xorg-x11-xfwp-1.0.2-1.fc16

Tue Jun 21 16:45:22 UTC 2011

commit 82c44857d2e84eca51bcc5a5306c725ca330e186
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 21 12:45:11 2011 -0400

    xorg-x11-xfwp-1.0.2-1.fc16

 .gitignore                                 |    2 +
 proxymngr-1.0.1-config.patch               |   13 ++++----
 proxymngr-1.0.1-lbxproxy-die-die-die.patch |   43 +++++++++++++++-------------
 sources                                    |    4 +-
 xorg-x11-xfwp.spec                         |   10 ++++--
 5 files changed, 41 insertions(+), 31 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 7f77282..1883371 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 proxymngr-1.0.1.tar.bz2
 xfindproxy-1.0.1.tar.bz2
 xfwp-1.0.1.tar.bz2
+/proxymngr-1.0.2.tar.bz2
+/xfwp-1.0.2.tar.bz2
diff --git a/proxymngr-1.0.1-config.patch b/proxymngr-1.0.1-config.patch
index 7cb27b5..c2b28d6 100644
--- a/proxymngr-1.0.1-config.patch
+++ b/proxymngr-1.0.1-config.patch
@@ -1,15 +1,16 @@
-diff -up proxymngr-1.0.1/Makefile.am.jx proxymngr-1.0.1/Makefile.am
---- proxymngr-1.0.1/Makefile.am.jx	2011-04-01 11:17:17.000000000 -0400
-+++ proxymngr-1.0.1/Makefile.am	2011-04-01 11:30:02.000000000 -0400
-@@ -21,13 +21,13 @@
+diff -up proxymngr-1.0.2/Makefile.am.jx proxymngr-1.0.2/Makefile.am
+--- proxymngr-1.0.2/Makefile.am.jx	2011-06-21 12:42:19.000000000 -0400
++++ proxymngr-1.0.2/Makefile.am	2011-06-21 12:43:18.167130547 -0400
+@@ -21,14 +21,14 @@
  
  bin_PROGRAMS = proxymngr
  
 -CONFIG_DIR = $(libdir)/X11/proxymngr
 +CONFIG_DIR = $(sysconfdir)/X11/proxymngr
  
- proxymngr_CFLAGS =					\
- 	$(PROXYMNGR_CFLAGS)					\
+ AM_CFLAGS =						\
+ 	$(CWARNFLAGS)					\
+ 	$(PROXYMNGR_CFLAGS)				\
  	-DXVENDORNAME=\"The\ X\.Org\ Foundation\"	\
  	-DXORG_RELEASE=\"Release\ $(VERSION)\"		\
 -	-DCONFIG_FILE=\"$(CONFIG_DIR)/proxymngr/pmconfig\"
diff --git a/proxymngr-1.0.1-lbxproxy-die-die-die.patch b/proxymngr-1.0.1-lbxproxy-die-die-die.patch
index e56487b..6617e4b 100644
--- a/proxymngr-1.0.1-lbxproxy-die-die-die.patch
+++ b/proxymngr-1.0.1-lbxproxy-die-die-die.patch
@@ -1,6 +1,22 @@
---- proxymngr-1.0.1/Makefile.am.lbx	2006-05-30 18:09:50.000000000 -0400
-+++ proxymngr-1.0.1/Makefile.am	2006-05-30 18:09:57.000000000 -0400
-@@ -46,7 +46,7 @@
+diff -up proxymngr-1.0.2/configure.ac.lbx proxymngr-1.0.2/configure.ac
+--- proxymngr-1.0.2/configure.ac.lbx	2010-10-30 16:28:49.000000000 -0400
++++ proxymngr-1.0.2/configure.ac	2011-06-21 12:41:59.905867185 -0400
+@@ -39,11 +39,6 @@ AM_CONFIG_HEADER(xconfig.h)
+ 
+ AC_PROG_CPP
+ 
+-AC_PATH_PROG(LBXPROXY, lbxproxy)
+-if [[ -z $LBXPROXY ]] ; then
+-   AC_MSG_ERROR([lbxproxy is needed])
+-fi
+-
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(PROXYMNGR, ice xt x11 xproxymngproto)
+ 
+diff -up proxymngr-1.0.2/Makefile.am.lbx proxymngr-1.0.2/Makefile.am
+--- proxymngr-1.0.2/Makefile.am.lbx	2010-10-30 16:24:56.000000000 -0400
++++ proxymngr-1.0.2/Makefile.am	2011-06-21 12:40:44.164612155 -0400
+@@ -47,7 +47,7 @@ configdir = $(CONFIG_DIR)
  config_DATA = pmconfig
  
  pmconfig: pmconfig.cpp
@@ -9,9 +25,10 @@
  
  EXTRA_DIST = pmconfig.cpp
  CLEANFILES = pmconfig
---- proxymngr-1.0.1/pmconfig.cpp.lbx	2006-05-30 18:07:55.000000000 -0400
-+++ proxymngr-1.0.1/pmconfig.cpp	2006-05-30 18:08:03.000000000 -0400
-@@ -6,7 +6,7 @@
+diff -up proxymngr-1.0.2/pmconfig.cpp.lbx proxymngr-1.0.2/pmconfig.cpp
+--- proxymngr-1.0.2/pmconfig.cpp.lbx	2010-10-30 16:24:56.000000000 -0400
++++ proxymngr-1.0.2/pmconfig.cpp	2011-06-21 12:40:44.164612155 -0400
+@@ -5,7 +5,7 @@
  !        or
  !    <serviceName> unmanaged <proxyAddress>
  !
@@ -20,17 +37,3 @@
  !
  ! substitute site-specific info
  !xfwp unmanaged firewall:4444
---- proxymngr-1.0.1/configure.ac.lbx	2006-05-30 18:08:16.000000000 -0400
-+++ proxymngr-1.0.1/configure.ac	2006-05-30 18:10:22.000000000 -0400
-@@ -34,11 +34,6 @@
- AC_PROG_CC
- AC_PROG_INSTALL
- 
--AC_PATH_PROG(LBXPROXY, lbxproxy)
--if [[ -z $LBXPROXY ]] ; then
--   AC_MSG_ERROR([lbxproxy is needed])
--fi
--
- AC_PATH_PROG(SED, sed)
- if [[ -z $SED ]] ; then
-    AC_MSG_ERROR([sed is needed])
diff --git a/sources b/sources
index b517f32..e1eb83b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-aad44d0f65b97fd6d564b1d2ae510bb1  proxymngr-1.0.1.tar.bz2
 5df3a162429bdd6ce5aea3ca5f6365b8  xfindproxy-1.0.1.tar.bz2
-0dbde8b3867032b9e4a383d46dfd7e48  xfwp-1.0.1.tar.bz2
+714c4656e749ce856690b872e3d4ac4c  proxymngr-1.0.2.tar.bz2
+eeb558aad30a8b2bc1f1f0e919ea6f38  xfwp-1.0.2.tar.bz2
diff --git a/xorg-x11-xfwp.spec b/xorg-x11-xfwp.spec
index ba5f8df..20bc55b 100644
--- a/xorg-x11-xfwp.spec
+++ b/xorg-x11-xfwp.spec
@@ -1,17 +1,17 @@
 %define pkgname xfwp
-%define xfwp_version 1.0.1
+%define xfwp_version 1.0.2
 
 Summary: X.Org X11 X firewall proxy
 Name: xorg-x11-%{pkgname}
 # NOTE: The package version should always be the upstream xfwp tarball version.
 Version: %{xfwp_version}
-Release: 14%{?dist}
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 
 Source0: ftp://ftp.x.org/pub/individual/app/xfwp-%{xfwp_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/proxymngr-1.0.1.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/proxymngr-1.0.2.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/xfindproxy-1.0.1.tar.bz2
 
 Patch0: proxymngr-1.0.1-lbxproxy-die-die-die.patch
@@ -80,6 +80,10 @@ firewall.
 %{_mandir}/man1/xfwp.1*
 
 %changelog
+* Tue Jun 21 2011 Adam Jackson <ajax at redhat.com> 1.0.2-1
+- xfwp 1.0.2
+- proxymngr 1.0.2
+
 * Fri Apr 01 2011 Adam Jackson <ajax at redhat.com> 1.0.1-14
 - Fix pmconfig install path configuration
 
