From 0481796b6514f776cda961f2769d1ca0c2555915 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:22:57 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for xmlrpc --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 42a7b6b9055a5d345679a6f6506e26ddae71e1f6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:24 +0000 Subject: [PATCH 2/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b6f6716..494614f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xmlrpc -# $Id: Makefile,v 1.1 2006/01/06 00:20:17 fnasser Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:32:20 notting Exp $ NAME := xmlrpc SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b233e72f0eb545f07b1f89829e36f5785917536b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 11 Mar 2010 12:45:59 +0000 Subject: [PATCH 3/4] Missing requires jpackage-utils added --- xmlrpc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xmlrpc.spec b/xmlrpc.spec index f2e2cd3..57d7a36 100644 --- a/xmlrpc.spec +++ b/xmlrpc.spec @@ -34,7 +34,7 @@ Name: xmlrpc Version: 2.0.1 -Release: 6.5%{?dist} +Release: 6.6%{?dist} Epoch: 0 Summary: Java XML-RPC implementation License: ASL 2.0 @@ -56,6 +56,7 @@ Requires: junit Requires: jakarta-commons-httpclient Requires: jakarta-commons-codec >= 1.3 Requires: jsse +Requires: jpackage-utils %if ! %{gcj_support} Buildarch: noarch @@ -78,6 +79,7 @@ statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*. %package javadoc Summary: Javadoc for %{name} Group: Development/Java +Requires: jpackage-utils %description javadoc Javadoc for %{name}. @@ -146,6 +148,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Thu Mar 11 2010 Peter Lemenkov - 0:2.0.1-6.6 +- Added missing requires jpackage-utils + * Mon Jul 27 2009 Fedora Release Engineering - 0:2.0.1-6.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From c266315e4ba5749e1da6e915472d0d85c5415d81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 18:09:55 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 494614f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlrpc -# $Id: Makefile,v 1.2 2007/10/15 19:32:20 notting Exp $ -NAME := xmlrpc -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12