xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.

Browse source 
Former-commit-id: 17101171b6 [formerly 1e726506e0] [formerly 39b12ee0fb [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]
Former-commit-id: 39b12ee0fb
Former-commit-id: 37461e68dd
This commit is contained in:
Bryan Kowal 2013-05-15 17:12:37 -05:00
parent 53f994c0a8
commit 3812567894
2 changed files with 44 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rpms/awips2.qpid/0.18/SOURCES/awips2/dependencies.txt
View file

@ -1,6 +1,6 @@
org.apache.commons.cli/commons-cli-1.2.jar
org.apache.commons.logging/commons-logging-1.1.1.jar
org.slf4j/slf4j-log4j12-1.6.1.jar
org.apache.commons.logging/commons-logging-1.1.2.jar
org.slf4j/slf4j-log4j12-1.7.5.jar
org.apache.ws.security/xalan-2.7.1.jar
org.apache.commons.beanutils/commons-beanutils-1.8.3.jar
org.apache.commons.digester/commons-digester-1.8.1.jar

55
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
View file

@ -1,23 +1,19 @@
diff -crB a/qpid-java.spec b/qpid-java.spec
*** a/qpid-java.spec 2013-04-15 16:19:49.000000000 -0500
--- b/qpid-java.spec 2013-04-24 13:31:29.000000000 -0500
*** a/qpid-java.spec 2013-05-14 20:24:21.000000000 -0500
--- b/qpid-java.spec 2013-05-15 16:24:20.000000000 -0500
***************
*** 1,6 ****
*** 1,4 ****
! Name: qpid-java
Version: 0.18
! Release: 2%{?dist}
Summary: Java implementation of Apache Qpid
License: Apache Software License
Group: Development/Java
--- 1,8 ----
+ %define _awips2_directory "/awips2/qpid"
+
--- 1,6 ----
! %define _awips2_directory "/awips2/qpid"
!
! Name: awips2-qpid-java
Version: 0.18
! Release: 1%{?dist}
! Release: 3%{?dist}
Summary: Java implementation of Apache Qpid
License: Apache Software License
Group: Development/Java
***************
*** 12,21 ****
--- 14,28 ----
@ -37,8 +33,19 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
***************
*** 35,40 ****
--- 42,55 ----
*** 35,45 ****
%description common
Java implementation of Apache Qpid - common files
%package client
Summary: Java implementation of Apache Qpid - client
Group: Development/Java
BuildArch: noarch
! Requires: qpid-java-common = %{version}-%{release}
Requires: log4j >= 1.2.12
%description client
--- 42,60 ----
%description common
Java implementation of Apache Qpid - common files
@ -53,6 +60,28 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
%package client
Summary: Java implementation of Apache Qpid - client
Group: Development/Java
BuildArch: noarch
! Requires: awips2-qpid-java-common = %{version}-%{release}
Requires: log4j >= 1.2.12
%description client
***************
*** 49,55 ****
Summary: Java implementation of Apache Qpid - example
Group: Development/Java
BuildArch: noarch
! Requires: qpid-java-client = %{version}-%{release}
%description example
Java implementation of Apache Qpid - example
--- 64,70 ----
Summary: Java implementation of Apache Qpid - example
Group: Development/Java
BuildArch: noarch
! Requires: awips2-qpid-java-client = %{version}-%{release}
%description example
Java implementation of Apache Qpid - example
***************
*** 58,67 ****
--- 73,97 ----