rpms/mod_jk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleanup spec file, remove unused zip subpkg, cleanup changelog

Browse Source 
Resolves: #1963135
This commit is contained in:
Coty Sutherland 2021-08-06 13:08:00 -04:00
parent f331077f35
commit 95b0a33f2b
1 changed files with 10 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
mod_jk.spec
View File

@ -1,11 +1,3 @@
%global meadalpha %{nil}
%global meadrel %{nil}
%global version_major 1
%global version_minor 2
%global version_micro 48
%global commitid 1c14fc065bc133887fdde55cab954691b3dc3aac
%global serial 19
# Licensed to the Apache Software Foundation (ASF) under one or more # Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with # contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. # this work for additional information regarding copyright ownership.
@ -30,19 +22,20 @@
%bcond_with tools %bcond_with tools
%define with_zips 1
%bcond_with zips
%{!?aprconf: %{expand: %%define aprconf %{_bindir}/apr-config}} %{!?aprconf: %{expand: %%define aprconf %{_bindir}/apr-config}}
%{!?apxs: %{expand: %%define apxs %{_bindir}/apxs}} %{!?apxs: %{expand: %%define apxs %{_bindir}/apxs}}
%{!?libtool: %{expand: %%define libtool %{_libdir}/apr-1/build/libtool}} %{!?libtool: %{expand: %%define libtool %{_libdir}/apr-1/build/libtool}}
%define aprincludes %(%{aprconf} --includes 2>/dev/null) %define aprincludes %(%{aprconf} --includes 2>/dev/null)
# Update commitid and serial when new sources and release version are available
%global commitid 1c14fc065bc133887fdde55cab954691b3dc3aac
%global serial 20
Name: mod_jk Name: mod_jk
Epoch: 0 Epoch: 0
Version: 1.2.48 Version: 1.2.48
Release: %{serial}.redhat_1%{?dist}.1 Release: %{serial}%{?dist}
Summary: Tomcat mod_jk connector for Apache Summary: Tomcat mod_jk connector for Apache
Group: Internet/WWW/Servers Group: Internet/WWW/Servers
@ -65,7 +58,6 @@ BuildRequires: java-devel >= 1.6.0
BuildRequires: jpackage-utils >= 0:1.5.38 BuildRequires: jpackage-utils >= 0:1.5.38
BuildRequires: libtool BuildRequires: libtool
BuildRequires: xalan-j2 >= 2.7.0 BuildRequires: xalan-j2 >= 2.7.0
BuildRequires: zip
%description %description
Tomcat-connectors (mod_jk) is a project that provides web server Tomcat-connectors (mod_jk) is a project that provides web server
@ -100,15 +92,6 @@ Summary: Analysis and report tools for %{pkg_name}
Miscellaneous %{pkg_name} analysis and report tools. Miscellaneous %{pkg_name} analysis and report tools.
%endif %endif
%if %with zips
%package src-zip
Summary: Container for the sources of the Tomcat %{pkg_name} connector.
Group: Development
%description src-zip
Container for the sources of the Tomcat %{pkg_name} connector.
%endif
%prep %prep
%setup -q -n tomcat-connectors-%{commitid} %setup -q -n tomcat-connectors-%{commitid}
@ -116,10 +99,6 @@ Container for the sources of the Tomcat %{pkg_name} connector.
native/common/Makefile.in native/common/Makefile.in
%build %build
%if %with zips
zip -q -r ../mod_jk-%{version}-src.zip *
%endif
# Adding the "-z,now" option in LDFLAGS in order to gain # Adding the "-z,now" option in LDFLAGS in order to gain
# full RELRO support # full RELRO support
LDFLAGS="$LDFLAGS -Wl,-z,now" LDFLAGS="$LDFLAGS -Wl,-z,now"
@ -130,7 +109,7 @@ pushd native
./buildconf.sh ./buildconf.sh
%configure --with-apxs="%{_bindir}/apxs" %configure --with-apxs="%{_bindir}/apxs"
export LIBTOOL="`%{_bindir}/apxs -q LIBTOOL 2>/dev/null`" export LIBTOOL="`%{_bindir}/apxs -q LIBTOOL 2>/dev/null`"
# Handle old apxs (without -q LIBTOOL), eg Red Hat 8.0 and 9. # Handle old apxs (without -q LIBTOOL), eg Red Hat 8.0 and 9.
if test -z "$LIBTOOL"; then if test -z "$LIBTOOL"; then
LIBTOOL="%{libtool}" LIBTOOL="%{libtool}"
fi fi
@ -139,7 +118,6 @@ pushd native
EXTRA_CFLAGS="$RPM_OPT_FLAGS" \ EXTRA_CFLAGS="$RPM_OPT_FLAGS" \
EXTRA_CPPFLAGS="%{aprincludes}" \ EXTRA_CPPFLAGS="%{aprincludes}" \
RHBUILD_CFLAGS="-DJK_RH_BUILD=-%{serial}" RHBUILD_CFLAGS="-DJK_RH_BUILD=-%{serial}"
popd popd
%install %install
@ -163,16 +141,12 @@ command="s|/usr/local/bin\b|%{_bindir}|"
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}/%{_bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}/%{_bindir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}/%{_var}/run/%{name} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}/%{_var}/run/%{name}
%{__install} -d -m 0700 ${RPM_BUILD_ROOT}/%{_var}/cache/httpd/%{name} %{__install} -d -m 0700 ${RPM_BUILD_ROOT}/%{_var}/cache/httpd/%{name}
# for tools # for tools
%if %with tools %if %with tools
%{__install} -p -m 0755 tools/reports/*.pl ${RPM_BUILD_ROOT}/%{_bindir} %{__install} -p -m 0755 tools/reports/*.pl ${RPM_BUILD_ROOT}/%{_bindir}
%endif %endif
%if %with zips
%{__mkdir_p} ${RPM_BUILD_ROOT}%{_javadir}/jbossas-fordev
%{__install} ../mod_jk-%{version}-src.zip ${RPM_BUILD_ROOT}%{_javadir}/jbossas-fordev/mod_jk-%{version}-src.zip
%endif
%clean %clean
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
@ -193,13 +167,10 @@ command="s|/usr/local/bin\b|%{_bindir}|"
%{_bindir}/* %{_bindir}/*
%endif %endif
%if %with zips
%files src-zip
%defattr(0644,root,root,0755)
%{_javadir}/jbossas-fordev/mod_jk-%{version}-src.zip
%endif
%changelog %changelog
* Mon Aug 16 2021 Coty Sutherland <csutherl@redhat.com> - 1.2.48-20
- Cleanup spec file and remove .redhat-N suffix from release
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0:1.2.48-19.redhat_1.1 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0:1.2.48-19.redhat_1.1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688
@ -215,83 +186,3 @@ command="s|/usr/local/bin\b|%{_bindir}|"
* Fri Jul 30 2021 George Zaronikas <gzaronik@redhat.com> - 1.2.48-16 * Fri Jul 30 2021 George Zaronikas <gzaronik@redhat.com> - 1.2.48-16
- Resolves: #1963135 - Resolves: #1963135
* Tue May 05 2020 Mladen Turk <mturk@redhat.com> - 1.2.48-1
- Upgrade to version 1.2.48
- Remowe jws variables from jbcs .spec file
- Update archaic license and description
* Fri Oct 11 2019 Dimitris Sartzetakis <dsartzet@redhat.com> - 1.2.46-22
- Rebuilding JBCS httpd 2.4.37-ER5
* Thu Oct 10 2019 Dimitris Sartzetakis <dsartzet@redhat.com> - 1.2.46-21
- JBCS httpd 2.4.37-ER5
* Wed Sep 25 2019 Dimitris Sartzetakis <dsartzet@redhat.com> - 1.2.46-20
- Building JCBS 2.4.37.ER4
* Fri Sep 20 2019 Dimitris Sartzetakis <dsartzet@redhat.com> - 1.2.46-19
- JBCS httpd 2.4.37.ER3
* Thu Aug 29 2019 Hui Wang <huwang@redhat.com> - 1.2.46-17
- Enable src-zip for rhel7
* Tue Aug 06 2019 Dimitris Sartzetakis <dsartzet@redhat.com> - 1.2.46-14
- JBCS 2.4.37.ER2
* Wed Jul 24 2019 Dimitris Sartzetakis <dsartzet@redhat.com> - 1.2.46-10
- JBCS 2.4.37.ER1
* Fri Jul 19 2019 Dimitris Sartzetakis <dsartzet@redhat.com> - 1.2.46-9
- JBCS 2.4.37.ER1
* Wed Jun 19 2019 Hui Wang <huwang@redhat.com> - 1.2.46-6
- Build with new httpd 2.4.37
* Thu Nov 01 2018 Sokratis Zappis <szappis@redhat.com> - 1.2.46-1
- Upgrade to 1.2.46
* Mon Apr 09 2018 Hui Wang <huwang@redhat.com> - 1.2.43-1
- Upgrade to 1.2.43
* Mon Mar 05 2018 Georgios Zaronikas Karagiannis <gzaronik@redhat.com> - 1.2.42-4
- Rebuild with httpd 2.4.29
* Mon Mar 05 2018 Georgios Zaronikas Karagiannis <gzaronik@redhat.com> - 1.2.42-3
- Rebuild with httpd 2.4.29
* Mon Mar 05 2018 Georgios Zaronikas Karagiannis <gzaronik@redhat.com> - 1.2.42-2
- Building with httpd 2.4.29
* Mon Feb 05 2018 Hui Wang <huwang@redhat.com> - 1.2.42-1
- Upgrade to 1.2.42
* Thu Dec 01 2016 Georgios Zaronikas Karagiannis <gzaronik@redhat.com> - 1.2.41-14
- Rebuild for CR1
* Tue Aug 30 2016 Georgios Zaronikas Karagiannis <gzaronik@redhat.com> - 1.2.41-13
- Added relro protection
* Thu Aug 18 2016 Patrick Sutherland <csutherl@redhat.com> - 1.2.41-12
-
* Thu Jul 21 2016 Jean-Frederic Clere <jclere@redhat.com> - 0:1.2.41-3.redhat_1
- Resolves: rhbz#1357852 RHEL6 i386: mod_jk module is missing symbol, httpd won't start
* Tue Dec 22 2015 Fernando Nasser <fnasser@redhat.com> - 0:1.2.40-9
- Build in the jbcs-httpd24 collection
* Wed May 27 2015 Jean-Frederic Clere <jclere@redhat.com> - 0:1.2.40-8.redhat_1
- JWS-24 Add missing patches.
* Tue Mar 03 2015 Weinan Li <weli@redhat.com> - 0:1.2.40-7.redhat_1
- JWS-14
* Mon Dec 15 2014 Permaine Cheung <pcheung@redhat.com> - 0:1.2.40-6.redhat_1
- Rebuild
* Wed Oct 15 2014 Permaine Cheung <pcheung@redhat.com> - 0:1.2.40-4.redhat_1
- Build against httpd24 on RHEL 6, 7
* Wed Sep 24 2014 Permaine Cheung <pcheung@redhat.com> - 0:1.2.40-3.redhat_1
- JWS 3.0 build