diff options
| -rw-r--r-- | clojure/clucy.spec | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/clojure/clucy.spec b/clojure/clucy.spec index 530eee3..be1a3e2 100644 --- a/clojure/clucy.spec +++ b/clojure/clucy.spec @@ -5,7 +5,7 @@ Name: %{artifactId} Version: 0.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Clojure interface to Lucene License: EPL @@ -17,25 +17,15 @@ Source0: %{vendor}-%{name}-%{version}-0-g%{commit_hash}.tar.gz # (Leiningen 2.x is needed as project.clj uses new-style profiles # not supported by Leiningen 1.x) Source1: %{name}-pom.xml +# Manifest file for our JAR generation +Source2: %{name}-manifest.txt BuildArch: noarch BuildRequires: jpackage-utils -BuildRequires: clojure-compat -BuildRequires: lucene-contrib BuildRequires: java-devel -BuildRequires: maven - -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-release-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin - Requires: jpackage-utils %if 0%{?rhel} Requires(post): jpackage-utils @@ -54,24 +44,16 @@ Clucy is a Clojure interface to Lucene. %prep %setup -q -n %{vendor}-%{name}-ea39643 cp -p %{SOURCE1} pom.xml +cp -p %{SOURCE2} manifest.txt %build -%if 0%{?rhel} -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL - -mvn-jpp \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -%else -mvn-rpmbuild \ -%endif - install +jar cmf manifest.txt %{name}.jar -C src . %install install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -pm 644 target/%{artifactId}-%{version}.jar \ +install -pm 644 %{name}.jar \ $RPM_BUILD_ROOT/%{_javadir}/%{name}.jar install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} @@ -102,5 +84,8 @@ install -pm 644 pom.xml \ %changelog +* Mon Jun 11 2012 Michel Salim <salimma@fedoraproject.org> - 0.3.0-2 +- Adopt packaging scriptlet from upstream's Debian branch + * Mon Jun 11 2012 Michel Salim <salimma@fedoraproject.org> - 0.3.0-1 - Initial package |