Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: spec: remove pre fedora-19 support ......................................................................
packaging: spec: remove pre fedora-19 support Change-Id: Id9de73ed52ee9a4048809d2f53ac948b5ea10c4a Signed-off-by: Alon Bar-Lev <[email protected]> --- M ovirt-host-deploy.spec.in 1 file changed, 4 insertions(+), 66 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy refs/changes/26/29226/1 diff --git a/ovirt-host-deploy.spec.in b/ovirt-host-deploy.spec.in index 7611116..fc52254 100644 --- a/ovirt-host-deploy.spec.in +++ b/ovirt-host-deploy.spec.in @@ -25,13 +25,6 @@ %global maven2brewrepodir %{_javadir}/repository.jboss.com/maven2-brew/dummy %endif -# rhel does not support complex boolean statements -%if 0%{?fedora:1} -%if %{fedora} >= 19 -%global fedora_19_maven 1 -%endif -%endif - Summary: oVirt host deploy tool Name: @PACKAGE_NAME@ Version: @PACKAGE_RPM_VERSION@ @@ -58,14 +51,7 @@ BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-source-plugin - -%if 0%{?fedora_19_maven:1} BuildRequires: maven-local -%else -BuildRequires: maven -BuildRequires: jpackage-utils -%endif - %endif %description @@ -76,10 +62,6 @@ Requires: %{name} = %{version}-%{release} Requires: java Requires: otopi-java - -%if !0%{?fedora_19_maven:1} -Requires: jpackage-utils -%endif %description java java libraries. @@ -117,11 +99,7 @@ %if 0%{?fedora:1} cd src/java -%if 0%{?fedora_19_maven:1} %mvn_build -%else -mvn-rpmbuild install javadoc:aggregate -%endif cd ../.. %endif @@ -130,44 +108,23 @@ make %{?_smp_mflags} install DESTDIR="%{buildroot}" %if 0%{?fedora:1} - -%if 0%{?fedora_19_maven:1} cd src/java %mvn_install cd ../.. %else -install -d -m 755 "%{buildroot}%{_javadir}/%{name}" -install -d -m 755 "%{buildroot}%{_mavenpomdir}" -install -pm 644 src/java/target/%{name}-%{package_maven_version}.jar %{buildroot}%{_javadir}/%{name} -ln -s "%{name}-%{package_maven_version}.jar" "%{buildroot}%{_javadir}/%{name}/%{name}.jar" -install -pm 644 "src/java/pom.xml" "%{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom" -%add_maven_depmap "JPP.%{name}-%{name}.pom" "%{name}/%{name}.jar" -mkdir -p "%{buildroot}%{_javadocdir}/%{name}" -cp -rp src/java/target/apidocs/* "%{buildroot}%{_javadocdir}/%{name}" -%endif - -%else install -d "%{buildroot}%{_javadir}/%{name}" install target/%{name}-%{package_maven_version}.jar %{buildroot}%{_javadir}/%{name} ln -s %{name}-%{package_maven_version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar -%endif +cat > src/java/.mfiles << __EOF__ +%{_javadir}/%{name}/ +__EOF__ -install -d -m 755 "%{buildroot}%{_sysconfdir}/%{name}.conf.d" - -%if 0%{?rhel:1} install -d "%{buildroot}%{maven2brewrepodir}" cp "%{buildroot}%{_javadir}/%{name}/%{name}.jar" "%{buildroot}%{maven2brewrepodir}/%{name}-%{package_maven_version}.jar" cp src/java/pom.xml "%{buildroot}%{maven2brewrepodir}/%{name}-%{package_maven_version}.pom" %endif -%if 0%{?fedora:1} -%if !0%{?fedora_19_maven:1} -%post java -%update_maven_depmap -%postun java -%update_maven_depmap -%endif -%endif +install -d -m 755 "%{buildroot}%{_sysconfdir}/%{name}.conf.d" %files %dir %{_datadir}/%{name} @@ -191,29 +148,10 @@ %{ovirt_host_deploy_root}/setup %{python_sitelib}/ovirt_host_deploy/ -%if 0%{?fedora_19_maven:1} %files java -f src/java/.mfiles -%dir %{_javadir}/%{name} -%else -%files java -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/%{name}*.jar -%if 0%{?fedora:1} -%{_mavenpomdir}/JPP.%{name}-%{name}.pom -%{_mavendepmapfragdir}/%{name} -%endif -%endif %if 0%{?fedora:1} - -%if 0%{?fedora_19_maven:1} %files javadoc -f src/java/.mfiles-javadoc -%else -%files javadoc -%dir %{_javadocdir}/%{name} -%{_javadocdir}/%{name} -%endif - %endif %if 0%{?rhel:1} -- To view, visit http://gerrit.ovirt.org/29226 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9de73ed52ee9a4048809d2f53ac948b5ea10c4a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-host-deploy Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
