[javapackages] Add trailing LF in %pom_* macros
by Mikolaj Izdebski
commit 01e67a441f0186013857986e014b3ae9693677c5
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jul 9 10:41:24 2012 +0200
Add trailing LF in %pom_* macros
Fixes bug #837203
macros.fjava | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index 7d89d2e..6f2586c 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -166,7 +166,8 @@ fi \
# directory containing pom.xml. If POM location is not given then pom.xml from
# current working directory is used.
#
-%pom_remove_dep() %{expand: %{__pom_call}remove_dep %*}
+%pom_remove_dep() %{expand: %{__pom_call}remove_dep %*
+}
# %pom_remove_plugin - remove Maven plugin invocation from POM file
@@ -184,7 +185,8 @@ fi \
# directory containing pom.xml. If POM location is not given then pom.xml from
# current working directory is used.
#
-%pom_remove_plugin() %{expand: %{__pom_call}remove_plugin %*}
+%pom_remove_plugin() %{expand: %{__pom_call}remove_plugin %*
+}
# %pom_disable_module - disable given project module in POM file
@@ -201,7 +203,8 @@ fi \
# directory containing pom.xml. If POM location is not given then pom.xml from
# current working directory is used.
#
-%pom_disable_module() %{expand: %{__pom_call}disable_module %*}
+%pom_disable_module() %{expand: %{__pom_call}disable_module %*
+}
# %pom_xpath_remove - remove an XML node from POM file
@@ -219,7 +222,8 @@ fi \
# directory containing pom.xml. If POM location is not given then pom.xml from
# current working directory is used.
#
-%pom_xpath_remove() %{expand: %{__pom_call}xpath_remove %*}
+%pom_xpath_remove() %{expand: %{__pom_call}xpath_remove %*
+}
# %pom_xpath_inject - inject XML code into POM file
@@ -237,4 +241,5 @@ fi \
# directory containing pom.xml. If POM location is not given then pom.xml from
# current working directory is used.
#
-%pom_xpath_inject() %{expand: %{__pom_call}xpath_inject %*}
+%pom_xpath_inject() %{expand: %{__pom_call}xpath_inject %*
+}
11 years, 9 months
[Bug 815101] New: update to 4.0.1.Final
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: update to 4.0.1.Final
https://bugzilla.redhat.com/show_bug.cgi?id=815101
Summary: update to 4.0.1.Final
Product: Fedora
Version: rawhide
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: hibernate-commons-annotations
AssignedTo: mgoldman(a)redhat.com
ReportedBy: puntogil(a)libero.it
QAContact: extras-qa(a)fedoraproject.org
CC: mgoldman(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: Bug
Regression: ---
Mount Type: ---
Documentation: ---
Description of problem:
Hibernate 4.x BR
Version-Release number of selected component (if applicable):
How reproducible:
Steps to Reproduce:
1.
2.
3.
Actual results:
Expected results:
Additional info:
depend on: https://bugzilla.redhat.com/show_bug.cgi?id=815098
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
11 years, 9 months
[Bug 809575] New: Add support for maven.local.mode
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: Add support for maven.local.mode
https://bugzilla.redhat.com/show_bug.cgi?id=809575
Summary: Add support for maven.local.mode
Product: Fedora
Version: 17
Platform: Unspecified
OS/Version: Unspecified
Status: NEW
Severity: unspecified
Priority: unspecified
Component: tycho
AssignedTo: rgrunber(a)redhat.com
ReportedBy: akurtako(a)redhat.com
QAContact: extras-qa(a)fedoraproject.org
CC: rgrunber(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Type: Bug
Regression: ---
Mount Type: ---
Documentation: ---
Maven in Fedora has a special mode called maven.local.mode which does a few
other changes in addition to making it work offline. See
http://pkgs.fedoraproject.org/gitweb/?p=maven.git;a=blob;f=0002-Use-custo...
Something similar should be done to tycho fullfilling the following 2 goals:
* make it resolve locally first but fetch from remote if not found locally -
mvn-local call
* make it resolve locally and fail if not found - mvn-rpmbuild
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
11 years, 9 months
[Bug 837862] New: Error when compiling against lucene 3.6.0 - [WARNING] The POM for org.apache.lucene:lucene-analyzers:jar:3.6.0 is missing, no dependency information available
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=837862
Bug ID: 837862
QA Contact: extras-qa(a)fedoraproject.org
Severity: high
Version: rawhide
Priority: unspecified
CC: akurtako(a)redhat.com, hicham.haouari(a)gmail.com,
java-sig-commits(a)lists.fedoraproject.org,
kdaniel(a)redhat.com
Assignee: akurtako(a)redhat.com
Summary: Error when compiling against lucene 3.6.0 - [WARNING]
The POM for
org.apache.lucene:lucene-analyzers:jar:3.6.0 is
missing, no dependency information available
Regression: ---
Story Points: ---
Classification: Fedora
OS: Linux
Reporter: orion(a)cora.nwra.com
Type: Bug
Documentation: ---
Hardware: All
Mount Type: ---
Status: NEW
Component: lucene
Product: Fedora
Description of problem:
Trying to compile pdfbox against lucene 3.6.0 in rawhide I get:
[WARNING] The POM for org.apache.lucene:lucene-analyzers:jar:3.6.0 is missing,
no dependency information available
lucene-analyzers is being brought in via lucene-demo in
/usr/share/maven-poms/JPP.lucene-contrib-lucene-demo.pom.
--
You are receiving this mail because:
You are on the CC list for the bug.
11 years, 9 months
[lucene] Properly install analyzers.
by Alexander Kurtakov
commit a321b103c69d977cdaa661577d0d6ccbc0c73e88
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Jul 5 23:12:25 2012 +0300
Properly install analyzers.
lucene.spec | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/lucene.spec b/lucene.spec
index 073fb54..7c982c6 100644
--- a/lucene.spec
+++ b/lucene.spec
@@ -31,7 +31,7 @@
Summary: High-performance, full-featured text search engine
Name: lucene
Version: 3.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
License: ASL 2.0
URL: http://lucene.apache.org/
@@ -150,8 +150,9 @@ unzip -o build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF
cp %{SOURCE2} META-INF/MANIFEST.MF
sed -i '/^\r$/d' META-INF/MANIFEST.MF
zip -u build/contrib/analyzers/common/lucene-analyzers-%{version}.jar META-INF/MANIFEST.MF
-cp dev-tools/maven/lucene/contrib/analyzers/common/pom.xml.template contrib/analyzers/
-cp build/contrib/analyzers/common/lucene-analyzers-%{version}.jar build/contrib/analyzers/
+
+mv build/contrib/analyzers/common build/contrib/analyzers/analyzers
+mv dev-tools/maven/lucene/contrib/analyzers/common dev-tools/maven/lucene/contrib/analyzers/analyzers
%install
@@ -166,7 +167,7 @@ ln -sf %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
# contrib jars
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}-contrib
-for c in analyzers benchmark demo facet grouping highlighter \
+for c in benchmark demo facet grouping highlighter \
icu instantiated join memory misc pruning queries queryparser remote \
spatial spellchecker xml-query-parser; do
install -m 0644 build/contrib/$c/%{name}-${c}-%{version}.jar \
@@ -177,6 +178,16 @@ for c in analyzers benchmark demo facet grouping highlighter \
%add_maven_depmap JPP.lucene-contrib-lucene-$c.pom %{name}-contrib/%{name}-${c}.jar
done
+# contrib analyzers
+for c in analyzers kuromoji phonetic smartcn stempel; do
+ install -m 0644 build/contrib/analyzers/$c/%{name}-${c}-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-contrib/%{name}-${c}.jar
+
+ install -m 0644 dev-tools/maven/lucene/contrib/analyzers/$c/pom.xml.template \
+ $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.lucene-contrib-lucene-$c.pom
+ %add_maven_depmap JPP.lucene-contrib-lucene-$c.pom %{name}-contrib/%{name}-${c}.jar
+done
+
# main poms
install -m 0644 dev-tools/maven/lucene/contrib/pom.xml.template \
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-lucene-contrib.pom
@@ -209,6 +220,9 @@ cp -pr build/docs/api/* \
%doc contrib/CHANGES.txt
%changelog
+* Thu Jul 5 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:3.6.0-4
+- Properly install analyzers.
+
* Wed Jul 4 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:3.6.0-3
- Really fix manifests.
11 years, 9 months