2013-03-25 13:27:13 -05:00
|
|
|
diff -crB a/qpid-java.spec b/qpid-java.spec
|
2013-09-16 17:05:17 -05:00
|
|
|
*** a/qpid-java.spec 2013-09-16 16:26:10.000000000 -0500
|
|
|
|
|
--- b/qpid-java.spec 2013-09-16 16:25:55.000000000 -0500
|
2013-03-25 13:27:13 -05:00
|
|
|
***************
|
2013-04-15 16:38:00 -05:00
|
|
|
*** 1,6 ****
|
2013-05-08 14:53:29 -05:00
|
|
|
! Name: qpid-java
|
2013-04-15 16:38:00 -05:00
|
|
|
Version: 0.18
|
|
|
|
|
! Release: 2%{?dist}
|
|
|
|
|
Summary: Java implementation of Apache Qpid
|
|
|
|
|
License: Apache Software License
|
|
|
|
|
Group: Development/Java
|
|
|
|
|
--- 1,8 ----
|
2013-05-15 11:53:02 -05:00
|
|
|
! %define _awips2_directory "/awips2/qpid"
|
|
|
|
|
!
|
2013-05-08 14:53:29 -05:00
|
|
|
! Name: awips2-qpid-java
|
2013-03-25 13:27:13 -05:00
|
|
|
Version: 0.18
|
2013-09-26 14:14:15 -05:00
|
|
|
! Release: 4%{?dist}
|
2013-04-15 16:38:00 -05:00
|
|
|
Summary: Java implementation of Apache Qpid
|
|
|
|
|
License: Apache Software License
|
|
|
|
|
Group: Development/Java
|
2013-03-25 13:27:13 -05:00
|
|
|
***************
|
|
|
|
|
*** 12,21 ****
|
2013-09-16 17:05:17 -05:00
|
|
|
--- 14,32 ----
|
2013-03-25 13:27:13 -05:00
|
|
|
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
|
2013-03-25 16:52:33 -05:00
|
|
|
+ Source5: qpidd
|
2013-04-15 16:38:00 -05:00
|
|
|
+ Source6: log4j.xml
|
2013-09-26 14:14:15 -05:00
|
|
|
+ Source7: qpid-wrapper
|
|
|
|
|
+ Source8: wrapper.conf
|
|
|
|
|
+ Source9: yajsw-distribution.tar
|
2013-03-25 13:27:13 -05:00
|
|
|
|
|
|
|
|
Patch0: mrg.patch
|
|
|
|
|
Patch1: examples.patch
|
|
|
|
|
Patch2: build.patch
|
|
|
|
|
+ Patch3: awips.patch
|
2013-09-26 14:14:15 -05:00
|
|
|
+ Patch4: qpid-messageNotFound.patch
|
2013-03-25 13:27:13 -05:00
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
***************
|
2013-05-15 11:53:02 -05:00
|
|
|
*** 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
|
2013-09-16 17:05:17 -05:00
|
|
|
--- 46,65 ----
|
2013-03-25 13:27:13 -05:00
|
|
|
%description common
|
|
|
|
|
Java implementation of Apache Qpid - common files
|
|
|
|
|
|
|
|
|
|
+ %package broker
|
|
|
|
|
+ Summary: Java implementation of Apache Qpid - broker files
|
|
|
|
|
+ Group: Development/Java
|
|
|
|
|
+ BuildArch: noarch
|
2013-05-15 11:53:02 -05:00
|
|
|
+ Provides: awips2-base-component
|
2013-03-25 13:27:13 -05:00
|
|
|
+
|
|
|
|
|
+ %description broker
|
|
|
|
|
+ Java implementation of Apache Qpid - broker files
|
|
|
|
|
+
|
|
|
|
|
%package client
|
|
|
|
|
Summary: Java implementation of Apache Qpid - client
|
|
|
|
|
Group: Development/Java
|
2013-05-15 11:53:02 -05:00
|
|
|
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
|
2013-09-16 17:05:17 -05:00
|
|
|
--- 69,75 ----
|
2013-05-15 11:53:02 -05:00
|
|
|
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
|
2013-03-25 13:27:13 -05:00
|
|
|
***************
|
|
|
|
|
*** 58,67 ****
|
2013-09-16 17:05:17 -05:00
|
|
|
--- 78,103 ----
|
2013-03-25 13:27:13 -05:00
|
|
|
%setup -q -n %{qpid_src_dir}
|
|
|
|
|
mkdir -p java/lib/required
|
|
|
|
|
tar -xvzf %SOURCE1 -C java/lib/required
|
|
|
|
|
+ # copy baseline libraries and other libraries to required
|
|
|
|
|
+ for dependency in `cat %{_topdir}/SOURCES/awips2/dependencies.txt`;
|
|
|
|
|
+ do
|
|
|
|
|
+ cp -f %{_baseline_workspace}/${dependency} java/lib/required
|
|
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
|
|
+ exit 1
|
|
|
|
|
+ fi
|
|
|
|
|
+ done
|
|
|
|
|
+ # copy dependencies that are not native to the baseline to required
|
2013-02-11 11:08:24 -06:00
|
|
|
+ cp -f %{_topdir}/SOURCES/awips2/*.jar %{_topdir}/SOURCES/awips2/*.war java/lib/required
|
2013-03-25 13:27:13 -05:00
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
|
|
+ exit 1
|
|
|
|
|
+ fi
|
|
|
|
|
|
|
|
|
|
%patch0 -p2
|
|
|
|
|
%patch1 -p2
|
|
|
|
|
%patch2 -p2
|
|
|
|
|
+ # apply the awips patch
|
|
|
|
|
+ %patch3 -p2
|
2013-09-16 16:15:50 -05:00
|
|
|
+ %patch4 -p2
|
2013-03-25 13:27:13 -05:00
|
|
|
|
|
|
|
|
%setup -q -T -b 2 -n %{qpid_deps_src_dir}
|
|
|
|
|
|
|
|
|
|
***************
|
|
|
|
|
*** 70,76 ****
|
|
|
|
|
|
|
|
|
|
(
|
|
|
|
|
cd %{qpid_src_dir}/java
|
|
|
|
|
! ant -Dretrieve.dependencies=false -Dmodules=common\ client
|
|
|
|
|
|
|
|
|
|
# blacklisted jars are either provided by the Requires: or not needed.
|
|
|
|
|
BLACKLIST="slf4j qpid-client-tests qpid-all qpid-common-tests"
|
2013-09-16 17:05:17 -05:00
|
|
|
--- 106,120 ----
|
2013-03-25 13:27:13 -05:00
|
|
|
|
|
|
|
|
(
|
|
|
|
|
cd %{qpid_src_dir}/java
|
|
|
|
|
! for module in ${QPID_MODULES[*]}; do
|
|
|
|
|
! ant -Dretrieve.dependencies=false \
|
|
|
|
|
! -Dmodules=${module}
|
|
|
|
|
! done
|
|
|
|
|
! ant -Dretrieve.dependencies=false \
|
2013-02-11 11:08:24 -06:00
|
|
|
! -Dmodules=common\ client\ amqp-1-0-common\ amqp-1-0-client\ amqp-1-0-client-jms\ management/common\ broker\ jca\ systests\ broker-plugins/access-control\ broker-plugins/firewall\ broker-plugins/management-http\ broker-plugins/management-jmx
|
2013-03-25 13:27:13 -05:00
|
|
|
! if [ $? -ne 0 ]; then
|
|
|
|
|
! exit 1
|
|
|
|
|
! fi
|
|
|
|
|
|
|
|
|
|
# blacklisted jars are either provided by the Requires: or not needed.
|
|
|
|
|
BLACKLIST="slf4j qpid-client-tests qpid-all qpid-common-tests"
|
|
|
|
|
***************
|
|
|
|
|
*** 84,130 ****
|
|
|
|
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
! install -dm 755 %{buildroot}%{_javadir}
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-client-%{version}.jar %{buildroot}%{_javadir}
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-client-%{version}-sources.jar %{buildroot}%{_javadir}
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-common-%{version}.jar %{buildroot}%{_javadir}
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-common-%{version}-sources.jar %{buildroot}%{_javadir}
|
|
|
|
|
!
|
|
|
|
|
! install -dm 755 %{buildroot}%{_javadir}/qpid-deps
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/log4j-slf4j.jar %{buildroot}%{_javadir}/qpid-deps
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-deps-%{version}.jar %{buildroot}%{_javadir}/qpid-deps
|
|
|
|
|
|
|
|
|
|
# examples
|
|
|
|
|
|
|
|
|
|
! install -dm 755 %{buildroot}%{_docdir}/%{name}-%{version}/examples/org/apache/qpid/example/
|
|
|
|
|
install -pm 644 %{qpid_src_dir}/java/client/example/src/main/java/org/apache/qpid/example/*.java \
|
|
|
|
|
! %{buildroot}%{_docdir}/%{name}-%{version}/examples/org/apache/qpid/example/
|
|
|
|
|
install -pm 644 %{qpid_src_dir}/java/client/example/src/main/java/org/apache/qpid/example/hello.properties \
|
|
|
|
|
! %{buildroot}%{_docdir}/%{name}-%{version}/examples/org/apache/qpid/example/
|
|
|
|
|
install -pm 644 %{qpid_src_dir}/java/client/example/example.log4j \
|
|
|
|
|
! %{buildroot}%{_docdir}/%{name}-%{version}/examples/
|
|
|
|
|
install -pm 755 %{qpid_src_dir}/java/client/example/bin/run_example.sh \
|
|
|
|
|
! %{buildroot}%{_docdir}/%{name}-%{version}/examples/
|
|
|
|
|
|
|
|
|
|
%clean
|
|
|
|
|
rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
|
%files common
|
|
|
|
|
! %defattr(-,root,root,-)
|
|
|
|
|
! %{_javadir}/qpid-deps/
|
|
|
|
|
! %{_javadir}/qpid-common-%{version}.jar
|
|
|
|
|
! %{_javadir}/qpid-common-%{version}-sources.jar
|
|
|
|
|
! %doc ../%{qpid_src_dir}/java/resources/LICENSE
|
|
|
|
|
! %doc ../%{qpid_src_dir}/java/resources/NOTICE
|
|
|
|
|
|
|
|
|
|
%files client
|
|
|
|
|
! %defattr(-,root,root,-)
|
|
|
|
|
! %{_javadir}/qpid-client-%{version}.jar
|
|
|
|
|
! %{_javadir}/qpid-client-%{version}-sources.jar
|
|
|
|
|
|
|
|
|
|
%files example
|
|
|
|
|
! %defattr(-,root,root,-)
|
|
|
|
|
! %{_docdir}/%{name}-%{version}/examples/
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Sep 6 2012 Irina Boverman <iboverma@redhat.com> - 0.18-2
|
2013-09-16 17:05:17 -05:00
|
|
|
--- 128,249 ----
|
2013-03-25 13:27:13 -05:00
|
|
|
|
|
|
|
|
cd ..
|
|
|
|
|
|
|
|
|
|
! install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-client-%{version}.jar \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-common-%{version}.jar \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-broker-%{version}.jar \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-management-common-%{version}.jar \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-management-jmx-%{version}.jar \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt
|
2013-02-11 11:08:24 -06:00
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-access-control-%{version}.jar \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-firewall-%{version}.jar \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-management-http-%{version}.jar \
|
2013-03-25 13:27:13 -05:00
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt
|
|
|
|
|
!
|
|
|
|
|
! # scripts for broker
|
|
|
|
|
! install -dm 755 %{buildroot}%{_awips2_directory}/bin
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/build/bin/* %{buildroot}%{_awips2_directory}/bin
|
2013-06-26 14:02:13 -05:00
|
|
|
! # install the wrapper script
|
|
|
|
|
! install -pm 644 %SOURCE7 %{buildroot}%{_awips2_directory}/bin
|
|
|
|
|
! # add the yajsw distribution
|
|
|
|
|
! tar -xf %SOURCE9 -C %{buildroot}%{_awips2_directory}/bin
|
|
|
|
|
!
|
|
|
|
|
! # wrapper configuration
|
|
|
|
|
! install -dm 755 %{buildroot}%{_awips2_directory}/conf
|
|
|
|
|
! install -pm 644 %SOURCE8 %{buildroot}%{_awips2_directory}/conf
|
2013-03-25 13:27:13 -05:00
|
|
|
!
|
|
|
|
|
! # service script
|
|
|
|
|
! mkdir -p %{buildroot}/etc/init.d
|
|
|
|
|
! install -pm 755 %SOURCE5 %{buildroot}/etc/init.d
|
2013-03-28 15:58:10 -05:00
|
|
|
! # logs directory
|
|
|
|
|
! mkdir -p %{buildroot}%{_awips2_directory}/log
|
2013-03-25 13:27:13 -05:00
|
|
|
!
|
|
|
|
|
! # qpid configuration
|
|
|
|
|
! install -dm 755 %{buildroot}%{_awips2_directory}/etc
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/broker/etc/* \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/etc
|
|
|
|
|
! # overwrite the default configuration with the AWIPS II configuration
|
|
|
|
|
! install -pm 644 %SOURCE3 %{buildroot}%{_awips2_directory}/etc
|
|
|
|
|
! install -pm 644 %SOURCE4 %{buildroot}%{_awips2_directory}/etc
|
|
|
|
|
!
|
2013-04-15 16:38:00 -05:00
|
|
|
! # overwrite the default log4j configuration with the AWIPS II log4j configuration
|
|
|
|
|
! install -pm 644 %SOURCE6 %{buildroot}%{_awips2_directory}/etc
|
|
|
|
|
!
|
2013-03-25 13:27:13 -05:00
|
|
|
! # foss dependencies
|
2013-03-28 15:58:10 -05:00
|
|
|
! install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
|
2013-03-25 13:27:13 -05:00
|
|
|
! install -pm 644 %{qpid_src_dir}/java/lib/required/*.jar \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
|
|
|
|
|
!
|
|
|
|
|
! # license & notice
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/resources/LICENSE \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}
|
|
|
|
|
! install -pm 644 %{qpid_src_dir}/java/resources/NOTICE \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}
|
|
|
|
|
|
|
|
|
|
# examples
|
|
|
|
|
|
|
|
|
|
! install -dm 755 %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/org/apache/qpid/example/
|
|
|
|
|
install -pm 644 %{qpid_src_dir}/java/client/example/src/main/java/org/apache/qpid/example/*.java \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/org/apache/qpid/example/
|
|
|
|
|
install -pm 644 %{qpid_src_dir}/java/client/example/src/main/java/org/apache/qpid/example/hello.properties \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/org/apache/qpid/example/
|
|
|
|
|
install -pm 644 %{qpid_src_dir}/java/client/example/example.log4j \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/
|
|
|
|
|
install -pm 755 %{qpid_src_dir}/java/client/example/bin/run_example.sh \
|
|
|
|
|
! %{buildroot}%{_awips2_directory}/doc/%{name}-%{version}/examples/
|
|
|
|
|
|
|
|
|
|
%clean
|
|
|
|
|
rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
|
%files common
|
|
|
|
|
! %defattr(-,awips,fxalpha,-)
|
|
|
|
|
! %dir /awips2/qpid
|
|
|
|
|
! %dir /awips2/qpid/lib
|
|
|
|
|
! %dir /awips2/qpid/lib/opt
|
|
|
|
|
! /awips2/qpid/lib/opt/qpid-common-%{version}.jar
|
|
|
|
|
! /awips2/qpid/lib/opt/qpid-management-common-%{version}.jar
|
|
|
|
|
! %dir /awips2/qpid/lib/opt/qpid-deps
|
|
|
|
|
! /awips2/qpid/lib/opt/qpid-deps/*
|
|
|
|
|
! %doc /awips2/qpid/LICENSE
|
|
|
|
|
! %doc /awips2/qpid/NOTICE
|
|
|
|
|
|
|
|
|
|
%files client
|
|
|
|
|
! %defattr(-,awips,fxalpha,-)
|
|
|
|
|
! %dir /awips2/qpid
|
|
|
|
|
! %dir /awips2/qpid/lib
|
|
|
|
|
! %dir /awips2/qpid/lib/opt
|
|
|
|
|
! /awips2/qpid/lib/opt/qpid-client-%{version}.jar
|
|
|
|
|
!
|
|
|
|
|
! %files broker
|
|
|
|
|
! %defattr(-,awips,fxalpha,-)
|
|
|
|
|
! %dir /awips2/qpid
|
|
|
|
|
! %dir /awips2/qpid/lib
|
|
|
|
|
! %dir /awips2/qpid/lib/opt
|
|
|
|
|
! /awips2/qpid/lib/opt/qpid-broker-%{version}.jar
|
|
|
|
|
! /awips2/qpid/lib/opt/qpid-broker-plugins-management-jmx-%{version}.jar
|
2013-02-11 11:08:24 -06:00
|
|
|
! /awips2/qpid/lib/opt/qpid-broker-plugins-access-control-%{version}.jar
|
|
|
|
|
! /awips2/qpid/lib/opt/qpid-broker-plugins-firewall-%{version}.jar
|
|
|
|
|
! /awips2/qpid/lib/opt/qpid-broker-plugins-management-http-%{version}.jar
|
2013-03-28 15:58:10 -05:00
|
|
|
! %dir /awips2/qpid/log
|
2013-06-26 14:02:13 -05:00
|
|
|
! %dir /awips2/qpid/conf
|
|
|
|
|
! /awips2/qpid/conf/*
|
2013-03-25 13:27:13 -05:00
|
|
|
! %defattr(755,awips,fxalpha,755)
|
|
|
|
|
! %dir /awips2/qpid/bin
|
|
|
|
|
! /awips2/qpid/bin/*
|
|
|
|
|
! %dir /awips2/qpid/etc
|
|
|
|
|
! /awips2/qpid/etc/*
|
|
|
|
|
! %defattr(755,root,root,755)
|
2013-03-25 16:52:33 -05:00
|
|
|
! /etc/init.d/qpidd
|
2013-03-25 13:27:13 -05:00
|
|
|
|
|
|
|
|
%files example
|
|
|
|
|
! %defattr(-,awips,fxalpha,-)
|
|
|
|
|
! /awips2/qpid/doc/%{name}-%{version}/examples/
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Sep 6 2012 Irina Boverman <iboverma@redhat.com> - 0.18-2
|
