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

Issue #1814 - use the AWIPS II log4j.xml for qpid

Browse source 
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1

Former-commit-id: b7297cb67055cafdef19595e0e0a481a33a9552e
This commit is contained in:
Bryan Kowal 2013-04-15 16:38:00 -05:00
parent 8c8709f4a6
commit 35b956fc4c
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,23 +1,33 @@
diff -crB a/qpid-java.spec b/qpid-java.spec
*** a/qpid-java.spec 2013-03-28 13:52:58.000000000 -0500
--- b/qpid-java.spec 2013-03-28 14:47:41.000000000 -0500
*** a/qpid-java.spec 2013-04-15 16:19:49.000000000 -0500
--- b/qpid-java.spec 2013-04-15 16:23:28.000000000 -0500
***************
*** 1,3 ****
--- 1,5 ----
*** 1,6 ****
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"
+
Name: qpid-java
Version: 0.18
Release: 2%{?dist}
! Release: 3%{?dist}
Summary: Java implementation of Apache Qpid
License: Apache Software License
Group: Development/Java
***************
*** 12,21 ****
--- 14,27 ----
--- 14,28 ----
Source0: %{qpid_src_dir}.tar.gz
Source1: qpid-build-deps-%{version}.tar.gz
Source2: %{qpid_deps_src_dir}.tar.gz
+ Source3: config.xml
+ Source4: virtualhosts.xml
+ Source5: qpidd
+ Source6: log4j.xml
Patch0: mrg.patch
Patch1: examples.patch
@ -28,7 +38,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
BuildArch: noarch
***************
*** 35,40 ****
--- 41,54 ----
--- 42,55 ----
%description common
Java implementation of Apache Qpid - common files
@ -45,7 +55,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
Group: Development/Java
***************
*** 58,67 ****
--- 72,96 ----
--- 73,97 ----
%setup -q -n %{qpid_src_dir}
mkdir -p java/lib/required
tar -xvzf %SOURCE1 -C java/lib/required
@ -80,7 +90,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
# blacklisted jars are either provided by the Requires: or not needed.
BLACKLIST="slf4j qpid-client-tests qpid-all qpid-common-tests"
--- 99,113 ----
--- 100,114 ----
(
cd %{qpid_src_dir}/java
@ -145,7 +155,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
%changelog
* Thu Sep 6 2012 Irina Boverman <iboverma@redhat.com> - 0.18-2
--- 121,235 ----
--- 122,239 ----
cd ..
@ -189,6 +199,9 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
! install -pm 644 %SOURCE3 %{buildroot}%{_awips2_directory}/etc
! install -pm 644 %SOURCE4 %{buildroot}%{_awips2_directory}/etc
!
! # overwrite the default log4j configuration with the AWIPS II log4j configuration
! install -pm 644 %SOURCE6 %{buildroot}%{_awips2_directory}/etc
!
! # foss dependencies
! install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
! install -pm 644 %{qpid_src_dir}/java/lib/required/*.jar \