[plexus-mail-sender] Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild"
by Mikolaj Izdebski
commit b03d29761ff2627ea4935eeb5f90e3fdb00197ab
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Nov 4 10:21:54 2013 +0100
Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild"
This reverts commit 167b615eae0fb9a1458aeb1377af043ee340d16d.
plexus-mail-sender.spec | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index e97cbe7..7d2c4ab 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
Name: plexus-mail-sender
Version: 1.0
-Release: 0.a2.24%{?dist}.1
+Release: 0.a2.24%{?dist}
Epoch: 0
Summary: Plexus Mail Sender
License: MIT and ASL 1.1
@@ -117,9 +117,6 @@ find . -iname 'pom.xml' -exec sed -i \
%changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.0-0.a2.24.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
* Thu Feb 7 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-0.a2.24
- Fix release tag
10 years, 5 months
[localizer] Update to upstream version 1.16
by Michal Srb
commit 189d06f042a9ceb3cc7cad9c344b891d178f1a4e
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Nov 4 07:49:49 2013 +0100
Update to upstream version 1.16
- Add license text
.gitignore | 2 +-
LICENSE.txt | 19 +++++++++++++++++++
localizer.spec | 11 ++++++++---
sources | 3 +--
4 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b831380..e7abcc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/localizer-parent-1.15.tar.gz
-/LICENSE.txt
+/localizer-parent-1.16.tar.gz
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..afc74b3
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/localizer.spec b/localizer.spec
index 1a3efbd..dff8c69 100644
--- a/localizer.spec
+++ b/localizer.spec
@@ -1,12 +1,13 @@
Name: localizer
-Version: 1.15
-Release: 2%{?dist}
+Version: 1.16
+Release: 1%{?dist}
Summary: Type-safe localization message access for Java
License: MIT
URL: https://github.com/kohsuke/localizer
Source0: https://github.com/kohsuke/%{name}/archive/%{name}-parent-%{version}.tar.gz
-Source1: https://raw.github.com/kohsuke/youdebug/youdebug-1.5/LICENSE.txt
+# License text taken from http://www.opensource.org/licenses/mit-license.php
+Source1: LICENSE.txt
BuildArch: noarch
@@ -69,6 +70,10 @@ cp %{SOURCE1} LICENSE
%doc LICENSE
%changelog
+* Mon Nov 04 2013 Michal Srb <msrb(a)redhat.com> - 1.16-1
+- Update to upstream version 1.16
+- Add license text
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 502b277..34ef4df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-8d0153ca936a2b9d2552d503d98861f8 localizer-parent-1.15.tar.gz
-3cc80563e3a38c4d642dc4a837e93e73 LICENSE.txt
+538706b64fad8b9e61b8647684e99502 localizer-parent-1.16.tar.gz
10 years, 5 months
[tomcat/f19] Updated to 7.0.47
by Ivan Afonichev
commit fb74d36077389c292aefd639824ed8dd748549a5
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Nov 4 00:04:06 2013 +0400
Updated to 7.0.47
Conflicts:
tomcat.spec
sources | 2 +-
tomcat.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index c9c84cf..2bb650f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b7319630dbfe1803fc84bcb48fc551c apache-tomcat-7.0.42-src.tar.gz
+4ee89bfd85f6afb31c7675b05f0469cb apache-tomcat-7.0.47-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index 158562f..44882b6 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
%global jspspec 2.2
%global major_version 7
%global minor_version 0
-%global micro_version 42
+%global micro_version 47
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.0
%global elspec 2.2
@@ -677,6 +677,9 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Sun Nov 03 2013 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.47-1
+- Updated to 7.0.47
+
* Thu Jul 11 2013 Dmitry Tikhonov <squall.sama(a)gmail.com> 0:7.0.42-1
- Updated to 7.0.42
10 years, 5 months
[tomcat/f18] Updated to 7.0.47
by Ivan Afonichev
commit 7ab10d49d6d85cfaf34a2ff7402c3945b566c2bc
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Nov 4 00:04:06 2013 +0400
Updated to 7.0.47
Conflicts:
tomcat.spec
sources | 2 +-
tomcat.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index c9c84cf..2bb650f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b7319630dbfe1803fc84bcb48fc551c apache-tomcat-7.0.42-src.tar.gz
+4ee89bfd85f6afb31c7675b05f0469cb apache-tomcat-7.0.47-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index 7efef13..83caa3a 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
%global jspspec 2.2
%global major_version 7
%global minor_version 0
-%global micro_version 42
+%global micro_version 47
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.0
%global elspec 2.2
@@ -677,6 +677,9 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Sun Nov 03 2013 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.47-1
+- Updated to 7.0.47
+
* Thu Jul 11 2013 Dmitry Tikhonov <squall.sama(a)gmail.com> 0:7.0.42-1
- Updated to 7.0.42
10 years, 5 months
[tomcat] Updated to 7.0.47
by Ivan Afonichev
Summary of changes:
2e1950e... Updated to 7.0.47 (*)
(*) This commit already existed in another branch; no separate mail sent
10 years, 5 months
[tomcat/f20] Updated to 7.0.47
by Ivan Afonichev
commit 2e1950e71c024982f4a0025fe7bf0b1fbe943125
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Nov 4 00:04:06 2013 +0400
Updated to 7.0.47
Fix java.security.policy
sources | 2 +-
tomcat-server | 2 +-
tomcat.spec | 8 ++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index c9c84cf..2bb650f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b7319630dbfe1803fc84bcb48fc551c apache-tomcat-7.0.42-src.tar.gz
+4ee89bfd85f6afb31c7675b05f0469cb apache-tomcat-7.0.47-src.tar.gz
diff --git a/tomcat-server b/tomcat-server
index ef8cec9..bd55999 100644
--- a/tomcat-server
+++ b/tomcat-server
@@ -16,7 +16,7 @@ if [ "$1" = "start" ] ; then
if [ "${SECURITY_MANAGER}" = "true" ] ; then
OPTIONS="${OPTIONS} \
-Djava.security.manager \
- -Djava.security.policy==\"${CATALINA_BASE}/conf/catalina.policy\""
+ -Djava.security.policy==${CATALINA_BASE}/conf/catalina.policy"
fi
run start
elif [ "$1" = "stop" ] ; then
diff --git a/tomcat.spec b/tomcat.spec
index ba04e78..d960a78 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
%global jspspec 2.2
%global major_version 7
%global minor_version 0
-%global micro_version 42
+%global micro_version 47
%global packdname apache-tomcat-%{version}-src
%global servletspec 3.0
%global elspec 2.2
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -661,6 +661,10 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Sun Nov 03 2013 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.47-1
+- Updated to 7.0.47
+- Fix java.security.policy
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:7.0.42-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 5 months
