[struts/f17] replace jakarta-taglibs-standard with jboss-jstl-1.2-api
by gil
commit 935d8d8b7223bdb5c131beaf4ec3f79c2d400a49
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 29 09:16:14 2012 +0200
replace jakarta-taglibs-standard with jboss-jstl-1.2-api
struts-1.3.10-el-pom.patch | 27 +++++++++++++++++++++++++++
struts.spec | 12 +++++++++---
2 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/struts-1.3.10-el-pom.patch b/struts-1.3.10-el-pom.patch
new file mode 100644
index 0000000..c98d58e
--- /dev/null
+++ b/struts-1.3.10-el-pom.patch
@@ -0,0 +1,27 @@
+--- src/el/pom.xml 2012-06-29 09:05:39.279687759 +0200
++++ src/el/pom.xml-gil 2012-06-29 09:05:39.290687790 +0200
+@@ -59,8 +59,8 @@
+ <dependencies>
+
+ <dependency>
+- <groupId>javax.servlet</groupId>
+- <artifactId>jstl</artifactId>
++ <groupId>org.jboss.spec.javax.servlet.jstl</groupId>
++ <artifactId>jboss-jstl-api_1.2_spec</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+@@ -96,11 +96,11 @@
+ <optional>true</optional>
+ </dependency>
+
+- <dependency>
++ <!--dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0.6</version>
+- </dependency>
++ </dependency-->
+
+ </dependencies>
+
diff --git a/struts.spec b/struts.spec
index fdd0c80..54c2199 100644
--- a/struts.spec
+++ b/struts.spec
@@ -1,7 +1,7 @@
%global master_version 4
Name: struts
Version: 1.3.10
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Web application framework
Group: Development/Libraries
License: ASL 2.0
@@ -21,6 +21,8 @@ Patch0: %{name}-%{version}-parent-pom.patch
# fix build for junit servlet-3.0-api
# change myfaces myfaces-jsf-api 1.0.9 with org.jboss.spec.javax.faces jboss-jsf-api_2.1_spec
Patch1: %{name}-%{version}-build.patch
+# replace jakarta-taglibs-standard with jboss-jstl-1.2-api
+Patch2: %{name}-%{version}-el-pom.patch
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -34,8 +36,8 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-validator
BuildRequires: bsf
BuildRequires: jakarta-oro
-BuildRequires: jakarta-taglibs-standard >= 1.1.2-5
BuildRequires: jboss-jsf-2.1-api
+BuildRequires: jboss-jstl-1.2-api
BuildRequires: tomcat-el-2.2-api
BuildRequires: tomcat-jsp-2.2-api
BuildRequires: tomcat-servlet-3.0-api
@@ -61,8 +63,8 @@ Requires: apache-commons-logging
Requires: apache-commons-validator
Requires: bsf
Requires: jakarta-oro
-Requires: jakarta-taglibs-standard >= 1.1.2-5
Requires: jboss-jsf-2.1-api
+Requires: jboss-jstl-1.2-api
Requires: junit
Requires: tomcat-el-2.2-api
Requires: tomcat-jsp-2.2-api
@@ -105,6 +107,7 @@ find -name "*.jar" -delete
find -name "*.class" -delete
%patch0 -p0
%patch1 -p1
+%patch2 -p0
sed -i 's/\r//' LICENSE.txt NOTICE.txt
@@ -160,6 +163,9 @@ cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
+* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-3
+- replace jakarta-taglibs-standard with jboss-jstl-1.2-api
+
* Sat Jun 23 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-2
- removed non-free resources
11 years, 10 months
[jdependency] Fix date ordering in changelog
by Stanislav Ochotnicky
commit 19076b2081fa9f91c99c5221e4f45a8af13b3a53
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Jun 29 10:45:43 2012 +0200
Fix date ordering in changelog
- Guidelines fixes
jdependency.spec | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/jdependency.spec b/jdependency.spec
index 86f295f..c18a8cb 100644
--- a/jdependency.spec
+++ b/jdependency.spec
@@ -3,7 +3,7 @@
Name: jdependency
Version: 0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: This project provides an API to analyse class dependencies
Group: Development/Libraries
@@ -16,7 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: maven
-#BuildRequires: maven2-common-poms
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -33,12 +32,9 @@ Requires: objectweb-asm >= 3.2
Requires: apache-commons-io
Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
-jdependency is small library that helps you analyze class level
+jdependency is small library that helps you analyze class level
dependencies, clashes and missing classes.
%package javadoc
@@ -57,8 +53,6 @@ mvn-rpmbuild -Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# Jar
mkdir -p %{buildroot}%{_javadir}
install -Dpm 644 target/%{name}-%{version}.jar \
@@ -80,22 +74,24 @@ install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-jdependency.pom
rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%{_javadir}/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%doc LICENSE.txt README.md
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%doc LICENSE.txt
%changelog
+* Fri Jun 29 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.7-3
+- Fix date ordering in changelog
+- Guidelines fixes
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-* Tue Dec 13 2012 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.7-1
+* Tue Dec 13 2011 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.7-1
- Update to 0.7
- Fix BR to not require maven2
- Fix BR for new package name
@@ -107,7 +103,7 @@ rm -rf %{buildroot}
* Thu Oct 14 2010 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.6-3
- Add license to javadoc subpackage
- Change jakarta-commons-io for apache-commons-io
-- Add BR to maven
+- Add BR to maven
* Thu Oct 14 2010 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.6-2
- Rename from vafer-jdependency to jdependency alone
11 years, 10 months
[Bug 827945] New: ant-1.8.4 is available
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=827945
Bug ID: 827945
Keywords: FutureFeature, Triaged
QA Contact: extras-qa(a)fedoraproject.org
Severity: unspecified
Version: rawhide
Priority: unspecified
CC: akurtako(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
jcapik(a)redhat.com, kdaniel(a)redhat.com,
mmatejov(a)redhat.com
Assignee: jcapik(a)redhat.com
Summary: ant-1.8.4 is available
Regression: ---
Story Points: ---
Classification: Fedora
OS: Unspecified
Reporter: upstream-release-monitoring(a)fedoraproject.org
Type: ---
Documentation: ---
Hardware: Unspecified
Mount Type: ---
Status: NEW
Component: ant
Product: Fedora
Latest upstream release: 1.8.4
Current version in Fedora Rawhide: 1.8.3
URL: http://www.apache.org/dist/ant/source/
Please consult the package updates policy before you issue an update to a
stable branch: https://fedoraproject.org/wiki/Updates_Policy
More information about the service that created this bug can be found at:
https://fedoraproject.org/wiki/Upstream_release_monitoring
--
You are receiving this mail because:
You are on the CC list for the bug.
11 years, 10 months