[tcpxtract] EPEL7 needs the same BR as Fedora
by wolfy
commit e251c3b125a53f15beafa9e32016f30fd2042ba5
Author: Manuel Wolfshant <wolfy(a)fedoraproject.org>
Date: Wed Oct 1 00:31:42 2014 +0300
EPEL7 needs the same BR as Fedora
tcpxtract.spec | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/tcpxtract.spec b/tcpxtract.spec
index d2980fa..caf30da 100644
--- a/tcpxtract.spec
+++ b/tcpxtract.spec
@@ -3,7 +3,7 @@
Name: tcpxtract
Version: 1.0.1
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Tool for extracting files from network traffic
Group: Applications/Internet
@@ -11,13 +11,14 @@ License: GPLv2+
URL: http://tcpxtract.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch: ppc ppc64
%if "0%{?dist}" == "0.el4"
BuildRequires: libpcap
%else
BuildRequires: libpcap-devel
%endif
-%if 0%{?fedora} >= 13
+%if 0%{?fedora} >= 13 || 0%{?rhel} > 6
BuildRequires: flex-static
%else
BuildRequires: flex
@@ -54,7 +55,8 @@ autoconf
%endif
%configure
-make %{?_smp_mflags}
+export LDFLAGS="-lfl"
+make %{?_smp_mflags}
%install
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 30 2014 manuel "lonely wolf" wolfshant <wolfy[AT]fedoraproject.org> - 1.0.1-19
+- EPEL7 needs the same BR as Fedora
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
8Â years, 4Â months
[cqrlog] Removed old build files
by Eric Christensen
commit a0dfba4b30379206f0ef06bb78212dba1d0aa591
Author: Eric Christensen <echriste(a)redhat.com>
Date: Tue Sep 30 17:25:56 2014 -0400
Removed old build files
results_cqrlog/1.7.4/1.el7/build.log | 1 -
results_cqrlog/1.7.4/1.el7/root.log | 109 ----------------------------------
results_cqrlog/1.7.4/1.el7/state.log | 10 ---
3 files changed, 0 insertions(+), 120 deletions(-)
8Â years, 4Â months
[cqrlog] Added empty debugging fix
by Eric Christensen
commit f65c1f131c3f003f9a98983e223e04ab74c86262
Author: Eric Christensen <echriste(a)redhat.com>
Date: Tue Sep 30 17:25:30 2014 -0400
Added empty debugging fix
cqrlog-generateDebug.patch | 12 ++++
cqrlog.spec | 7 ++-
results_cqrlog/1.7.4/1.el7/build.log | 1 +
results_cqrlog/1.7.4/1.el7/root.log | 109 ++++++++++++++++++++++++++++++++++
results_cqrlog/1.7.4/1.el7/state.log | 10 +++
5 files changed, 138 insertions(+), 1 deletions(-)
---
diff --git a/cqrlog-generateDebug.patch b/cqrlog-generateDebug.patch
new file mode 100644
index 0000000..11c7ad7
--- /dev/null
+++ b/cqrlog-generateDebug.patch
@@ -0,0 +1,12 @@
+diff -up cqrlog-1.8.1/src/cqrlog.lpi~ cqrlog-1.8.1/src/cqrlog.lpi
+--- cqrlog-1.8.1/src/cqrlog.lpi~ 2014-07-26 10:27:10.000000000 +0300
++++ cqrlog-1.8.1/src/cqrlog.lpi 2014-08-04 00:06:14.224116323 +0300
+@@ -692,7 +692,7 @@
+ </CodeGeneration>
+ <Linking>
+ <Debugging>
+- <GenerateDebugInfo Value="False"/>
++ <GenerateDebugInfo Value="True"/>
+ </Debugging>
+ </Linking>
+ <Other>
diff --git a/cqrlog.spec b/cqrlog.spec
index e8cc822..ac8d5c5 100644
--- a/cqrlog.spec
+++ b/cqrlog.spec
@@ -1,6 +1,6 @@
Name: cqrlog
Version: 1.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: An amateur radio contact logging program
Group: Applications/Databases
@@ -9,6 +9,7 @@ URL: http://www.cqrlog.com/
Source0: http://www.cqrlog.com/files/%{name}_%{version}/%{name}_%{version}.src.tar.gz
Patch0: cqrlog.makefile.patch
Patch1: cqrlog.desktop.patch
+Patch2: cqrlog-generateDebug.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fpc not available on these arches
@@ -37,6 +38,7 @@ tar -xpf %{SOURCE0}
%setup -q -D -T
%patch0
%patch1
+%patch2
chmod -x src/azidis3.pas
chmod -x src/gline2.pas
@@ -152,6 +154,9 @@ iconv -f iso8859-1 -t utf-8 %{buildroot}%{_datadir}/%{name}/ctyfiles/eqsl.txt >
%{_mandir}/man1/cqrlog.1.gz
%changelog
+* Tue Sep 30 2014 Eric "Sparks" Christensen <sparks(a)fedoraproject.org> - 1.8.1-3
+- Fixed empty debugging (BZ 1126233)
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/results_cqrlog/1.7.4/1.el7/build.log b/results_cqrlog/1.7.4/1.el7/build.log
new file mode 100644
index 0000000..a6db795
--- /dev/null
+++ b/results_cqrlog/1.7.4/1.el7/build.log
@@ -0,0 +1 @@
+Mock Version: 1.1.39
diff --git a/results_cqrlog/1.7.4/1.el7/root.log b/results_cqrlog/1.7.4/1.el7/root.log
new file mode 100644
index 0000000..088d0bb
--- /dev/null
+++ b/results_cqrlog/1.7.4/1.el7/root.log
@@ -0,0 +1,109 @@
+INFO backend.py:1064: Mock Version: 1.1.39
+DEBUG backend.py:353: rootdir = /var/lib/mock/epel-7-x86_64/root/
+DEBUG backend.py:354: resultdir = /home/echriste/repos/Fedora/cqrlog/results_cqrlog/1.7.4/1.el7
+INFO backend.py:357: calling preinit hooks
+DEBUG util.py:64: ensuring that dir exists: /var/cache/mock/epel-7-x86_64/root_cache/
+DEBUG util.py:67: creating dir: /var/cache/mock/epel-7-x86_64/root_cache/
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/var/cache/yum
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/var/cache/yum
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/tmp/ccache
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/tmp/ccache
+DEBUG util.py:64: ensuring that dir exists: /var/cache/mock/epel-7-x86_64/ccache/
+DEBUG util.py:67: creating dir: /var/cache/mock/epel-7-x86_64/ccache/
+DEBUG backend.py:527: create skeleton dirs
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/var/lib/rpm
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/var/lib/rpm
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/var/lib/yum
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/var/lib/yum
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/var/lib/dbus
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/var/lib/dbus
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/var/log
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/var/log
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/var/cache/yum
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/etc/rpm
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/etc/rpm
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/tmp
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/tmp/ccache
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/var/tmp
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/var/tmp
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/etc/yum.repos.d
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/etc/yum.repos.d
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/etc/yum
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/etc/yum
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/proc
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/proc
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/sys
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/sys
+DEBUG backend.py:548: touch required files
+DEBUG util.py:76: touching file: /var/lib/mock/epel-7-x86_64/root/etc/mtab
+DEBUG util.py:76: touching file: /var/lib/mock/epel-7-x86_64/root/etc/fstab
+DEBUG util.py:76: touching file: /var/lib/mock/epel-7-x86_64/root/var/log/yum.log
+DEBUG backend.py:372: configure yum
+DEBUG backend.py:386: configure yum priorities
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/etc/yum/pluginconf.d
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/etc/yum/pluginconf.d
+DEBUG backend.py:388: configure yum rhnplugin
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/etc/yum/pluginconf.d
+DEBUG util.py:91: remove tree: /var/lib/mock/epel-7-x86_64/root/dev
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/dev/pts
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/dev/pts
+DEBUG util.py:64: ensuring that dir exists: /var/lib/mock/epel-7-x86_64/root/dev/shm
+DEBUG util.py:67: creating dir: /var/lib/mock/epel-7-x86_64/root/dev/shm
+DEBUG backend.py:494: kernel version == 3.14.8-200.fc20.x86_64
+DEBUG util.py:331: Executing command: ['/bin/mount', '-n', '-t', 'proc', 'proc', '/var/lib/mock/epel-7-x86_64/root/proc'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/mount', '-n', '-t', 'sysfs', 'mock_chroot_sys', '/var/lib/mock/epel-7-x86_64/root/sys'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/mount', '-n', '-t', 'tmpfs', 'mock_chroot_shmfs', '/var/lib/mock/epel-7-x86_64/root/dev/shm'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/mount', '-n', '-t', 'devpts', '-o', 'gid=5,mode=0620,ptmxmode=0666,newinstance', 'mock_chroot_devpts', '/var/lib/mock/epel-7-x86_64/root/dev/pts'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/mount', '-n', '--bind', '/var/cache/mock/epel-7-x86_64/yum_cache/', '/var/lib/mock/epel-7-x86_64/root/var/cache/yum'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/mount', '-n', '--bind', '/var/cache/mock/epel-7-x86_64/ccache/', '/var/lib/mock/epel-7-x86_64/root/tmp/ccache'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/mount', '-n', '--bind', '/tmp/mock-selinux-plugin.ndiRIg', '/var/lib/mock/epel-7-x86_64/root/proc/filesystems'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG backend.py:991: ['/usr/bin/yum', '--installroot', '/var/lib/mock/epel-7-x86_64/root/', 'install', '@buildsys-build']
+DEBUG util.py:331: Executing command: ['/usr/bin/yum', '--installroot', '/var/lib/mock/epel-7-x86_64/root/', 'install', '@buildsys-build', '--setopt=tsflags=nocontexts'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'LC_MESSAGES': 'C', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'echo -n "<mock-chroot>"', 'HOME': '/builddir', 'CCACHE_DIR': '/tmp/ccache', 'CCACHE_UMASK': '002'}
+DEBUG util.py:281: http://ftp.redhat.com/pub/redhat/rhel/rc/7/Server/x86_64/os/repodata/repo...: [Errno 14] HTTP Error 404 - Not Found
+DEBUG util.py:281: Trying other mirror.
+DEBUG util.py:281: One of the configured repositories failed (el),
+DEBUG util.py:281: and yum doesn't have enough cached data to continue. At this point the only
+DEBUG util.py:281: safe thing yum can do is fail. There are a few ways to work "fix" this:
+DEBUG util.py:281: 1. Contact the upstream for the repository and get them to fix the problem.
+DEBUG util.py:281: 2. Reconfigure the baseurl/etc. for the repository, to point to a working
+DEBUG util.py:281: upstream. This is most often useful if you are using a newer
+DEBUG util.py:281: distribution release than is supported by the repository (and the
+DEBUG util.py:281: packages for the previous distribution release still work).
+DEBUG util.py:281: 3. Disable the repository, so yum won't use it by default. Yum will then
+DEBUG util.py:281: just ignore the repository until you permanently enable it again or use
+DEBUG util.py:281: --enablerepo for temporary usage:
+DEBUG util.py:281: yum-config-manager --disable el
+DEBUG util.py:281: 4. Configure the failing repository to be skipped, if it is unavailable.
+DEBUG util.py:281: Note that yum will try to contact the repo. when it runs most commands,
+DEBUG util.py:281: so will have to try and fail each time (and thus. yum will be be much
+DEBUG util.py:281: slower). If it is a very temporary problem though, this is often a nice
+DEBUG util.py:281: compromise:
+DEBUG util.py:281: yum-config-manager --save --setopt=el.skip_if_unavailable=true
+DEBUG util.py:281: failure: repodata/repomd.xml from el: [Errno 256] No more mirrors to try.
+DEBUG util.py:281: http://ftp.redhat.com/pub/redhat/rhel/rc/7/Server/x86_64/os/repodata/repo...: [Errno 14] HTTP Error 404 - Not Found
+DEBUG util.py:371: Child return code was: 1
+DEBUG util.py:331: Executing command: ['/bin/umount', '-n', '/var/lib/mock/epel-7-x86_64/root/proc/filesystems'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/umount', '-n', '/var/lib/mock/epel-7-x86_64/root/tmp/ccache'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/umount', '-n', '/var/lib/mock/epel-7-x86_64/root/var/cache/yum'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/umount', '-n', '-l', '/var/lib/mock/epel-7-x86_64/root/dev/pts'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/umount', '-n', '-l', '/var/lib/mock/epel-7-x86_64/root/dev/shm'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/umount', '-n', '-l', '/var/lib/mock/epel-7-x86_64/root/sys'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:331: Executing command: ['/bin/umount', '-n', '-l', '/var/lib/mock/epel-7-x86_64/root/proc'] with env {'LANG': 'en_US.UTF-8', 'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOSTNAME': 'mock', 'HOME': '/builddir', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin'}
+DEBUG util.py:371: Child return code was: 0
+DEBUG util.py:119: kill orphans
+DEBUG util.py:91: remove tree: /var/lib/mock/epel-7-x86_64.tmp
+INFO backend.py:228: chroot (/var/lib/mock/epel-7-x86_64) unlocked and deleted
+DEBUG util.py:119: kill orphans
diff --git a/results_cqrlog/1.7.4/1.el7/state.log b/results_cqrlog/1.7.4/1.el7/state.log
new file mode 100644
index 0000000..d466a69
--- /dev/null
+++ b/results_cqrlog/1.7.4/1.el7/state.log
@@ -0,0 +1,10 @@
+2014-06-27 10:17:05,255 - Mock Version: 1.1.39
+2014-06-27 10:17:05,257 - Start: cleaning yum metadata
+2014-06-27 10:17:05,257 - Finish: cleaning yum metadata
+2014-06-27 10:17:05,271 - Start: device setup
+2014-06-27 10:17:05,273 - Finish: device setup
+2014-06-27 10:17:05,273 - Start: yum update
+2014-06-27 10:17:08,369 - Start: lock buildroot
+2014-06-27 10:17:08,369 - Start: clean chroot
+2014-06-27 10:17:08,386 - Finish: clean chroot
+2014-06-27 10:17:08,386 - Finish: lock buildroot
8Â years, 4Â months
[tcpxtract/epel7] EPEL7 needs the same BR as Fedora
by wolfy
commit ab0203bda9f6c0dc9f585cd6936bb989231b6e20
Author: Manuel Wolfshant <wolfy(a)fedoraproject.org>
Date: Wed Oct 1 00:15:17 2014 +0300
EPEL7 needs the same BR as Fedora
tcpxtract.spec | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/tcpxtract.spec b/tcpxtract.spec
index d2980fa..caf30da 100644
--- a/tcpxtract.spec
+++ b/tcpxtract.spec
@@ -3,7 +3,7 @@
Name: tcpxtract
Version: 1.0.1
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Tool for extracting files from network traffic
Group: Applications/Internet
@@ -11,13 +11,14 @@ License: GPLv2+
URL: http://tcpxtract.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch: ppc ppc64
%if "0%{?dist}" == "0.el4"
BuildRequires: libpcap
%else
BuildRequires: libpcap-devel
%endif
-%if 0%{?fedora} >= 13
+%if 0%{?fedora} >= 13 || 0%{?rhel} > 6
BuildRequires: flex-static
%else
BuildRequires: flex
@@ -54,7 +55,8 @@ autoconf
%endif
%configure
-make %{?_smp_mflags}
+export LDFLAGS="-lfl"
+make %{?_smp_mflags}
%install
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 30 2014 manuel "lonely wolf" wolfshant <wolfy[AT]fedoraproject.org> - 1.0.1-19
+- EPEL7 needs the same BR as Fedora
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
8Â years, 4Â months
[tomcatjss/f20] Resolves: rhbz #871171,1058366
by Christina Fu
commit 283d395499f8b977c4dfa27284752990ba386033
Author: Christina Fu <cfu(a)redhat.com>
Date: Tue Sep 30 14:10:55 2014 -0700
Resolves: rhbz #871171,1058366
* Bugzilla Bug #871171 - Provide Tomcat support for TLS v1.1 and TLS v1.2 (Tomcatjss)
* Bugzilla Bug #1058366 - NullPointerException in tomcatjss searching for attribute "clientauth"
sources | 2 +-
tomcatjss.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 6bb47a6..a382a9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d1fcc146a4fa48e132c7e8150faef09 tomcatjss-7.1.1.tar.gz
+54d88b865e5e13cb2a4b3f6874a33cdb tomcatjss-7.1.1.tar.gz
diff --git a/tomcatjss.spec b/tomcatjss.spec
index f82e581..48d8a28 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -17,7 +17,7 @@ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.ta
BuildRequires: ant
BuildRequires: java-devel
BuildRequires: jpackage-utils >= 0:1.7.5-15
-BuildRequires: jss >= 4.2.6-24
+BuildRequires: jss >= 4.2.6-35
BuildRequires: tomcat >= 7.0.40
%if 0%{?fedora} >= 21
@@ -26,7 +26,7 @@ Requires: java-headless
Requires: java
%endif
Requires: jpackage-utils >= 0:1.7.5-15
-Requires: jss >= 4.2.6-24
+Requires: jss >= 4.2.6-35
Requires: tomcat >= 7.0.40
# The 'tomcatjss' package conflicts with the 'tomcat-native' package
8Â years, 4Â months
[kernel] tag for build 3.17.0-0.rc7.git0.2
by Kyle McMartin
commit 9ee62d10a358f36f994b79d9cc570ee95940333e
Author: Kyle McMartin <kyle(a)fedoraproject.org>
Date: Tue Sep 30 16:53:17 2014 -0400
tag for build 3.17.0-0.rc7.git0.2
kernel.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 02a9f15..9e6ccc5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2230,7 +2230,7 @@ fi
# ||----w |
# || ||
%changelog
-* Tue Sep 30 2014 Kyle McMartin <kyle(a)fedoraproject.org>
+* Tue Sep 30 2014 Kyle McMartin <kyle(a)fedoraproject.org> - 3.17.0-0.rc7.git0.2
- Revert some v3.16 changes to mach-highbank which broke L2 cache enablement.
Will debug upstream separately, but we need F22/21 running there. (#1139762)
8Â years, 4Â months
[tomcatjss/f20] Resolves: rhbz #871171,1058366
by Christina Fu
commit 0d8f29a7cab5f60f5c0121760f1c9e15d1bf0f7f
Author: Christina Fu <cfu(a)redhat.com>
Date: Tue Sep 30 13:49:13 2014 -0700
Resolves: rhbz #871171,1058366
* Bugzilla Bug #871171 - Provide Tomcat support for TLS v1.1 and TLS v1.2 (Tomcatjss)
* Bugzilla Bug #1058366 - NullPointerException in tomcatjss searching for attribute "clientauth"
.gitignore | 1 +
sources | 2 +-
tomcatjss.spec | 29 ++++++++++++++++++++++++++---
3 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ddf6197..be96159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tomcatjss-1.2.0.tar.gz
/tomcatjss-6.0.2.tar.gz
/tomcatjss-7.0.0.tar.gz
/tomcatjss-7.1.0.tar.gz
+/tomcatjss-7.1.1.tar.gz
diff --git a/sources b/sources
index ab749d6..6bb47a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43566b6cd9249b4e861c5a1646de679b tomcatjss-7.1.0.tar.gz
+4d1fcc146a4fa48e132c7e8150faef09 tomcatjss-7.1.1.tar.gz
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 076cbd0..f82e581 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,6 +1,6 @@
Name: tomcatjss
-Version: 7.1.0
-Release: 4%{?dist}
+Version: 7.1.1
+Release: 1%{?dist}
Summary: JSSE implementation using JSS for Tomcat
URL: http://pki.fedoraproject.org/
License: LGPLv2+
@@ -20,7 +20,11 @@ BuildRequires: jpackage-utils >= 0:1.7.5-15
BuildRequires: jss >= 4.2.6-24
BuildRequires: tomcat >= 7.0.40
+%if 0%{?fedora} >= 21
+Requires: java-headless
+%else
Requires: java
+%endif
Requires: jpackage-utils >= 0:1.7.5-15
Requires: jss >= 4.2.6-24
Requires: tomcat >= 7.0.40
@@ -63,8 +67,10 @@ unzip %{name}-%{version}.zip -d %{buildroot}
# Install our files
cd %{buildroot}%{_javadir}
+%if 0%{?rhel} || 0%{?fedora} < 21
mv %{name}.jar %{name}-%{version}.jar
ln -s %{name}-%{version}.jar %{name}.jar
+%endif
%clean
rm -rf %{buildroot}
@@ -75,6 +81,23 @@ rm -rf %{buildroot}
%{_javadir}/*
%changelog
+* Tue Sep 30 2014 Christina Fu <cfu(a)redhat.com> 7.1.1-1
+- Bugzilla Bug #1058366 NullPointerException in tomcatjss searching
+ for attribute "clientauth" (cfu)
+- Bugzilla Bug #871171 - Provide Tomcat support for TLS v1.1 and
+ TLS v1.2 (cfu)
+- Bumped revision to 7.1.1
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 7.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 25 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 7.1.0-5
+- Move to java-headless
+- Resolves: rhbz#1068567
+
+* Tue Jan 07 2014 Michael Simacek <msimacek(a)redhat.com> - 7.1.0-5
+- Remove versioned symlink (rhbz#1022167)
+
* Fri Aug 2 2013 Ville Skyttä <ville.skytta(a)iki.fi> - 7.1.0-4
- Simplify installation of docs.
@@ -92,7 +115,7 @@ rm -rf %{buildroot}
- PKI TRAC Ticket #283 - Dogtag 10: Integrate Tomcat 6 'tomcatjss.jar' and
Tomcat 7 'tomcat7jss.jar' in Fedora 18 tomcatjss package
-* Wed Jul 26 2012 Matthew Harmsen <mharmsen(a)redhat.com> 7.0.0-2
+* Thu Jul 26 2012 Matthew Harmsen <mharmsen(a)redhat.com> 7.0.0-2
- Fixed runtime 'Requires' cut/paste typos
* Wed Jun 06 2012 Matthew Harmsen <mharmsen(a)redhat.com> 7.0.0-1
8Â years, 4Â months