[takari-incrementalbuild] Working build

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Mar 12 13:14:40 UTC 2015


commit 4c55d7d952187562777f314ef43ad562ded91897
Author: Michael Simacek <msimacek at redhat.com>
Date:   Fri Mar 6 19:24:54 2015 +0100

    Working build

 0001-Workaround-for-mtime-truncation.patch | 25 ++++++++++
 takari-incrementalbuild.spec               | 76 +++++++++++++++++++++++++++---
 2 files changed, 95 insertions(+), 6 deletions(-)
---
diff --git a/0001-Workaround-for-mtime-truncation.patch b/0001-Workaround-for-mtime-truncation.patch
new file mode 100644
index 0000000..1dabc43
--- /dev/null
+++ b/0001-Workaround-for-mtime-truncation.patch
@@ -0,0 +1,25 @@
+From 840cc2be11f74f0c2232513d7797ad85fdf307ed Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Tue, 3 Mar 2015 15:13:08 +0100
+Subject: [PATCH] Workaround for mtime truncation
+
+---
+ .../main/java/io/takari/incrementalbuild/spi/FilesystemWorkspace.java   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/incrementalbuild/src/main/java/io/takari/incrementalbuild/spi/FilesystemWorkspace.java b/incrementalbuild/src/main/java/io/takari/incrementalbuild/spi/FilesystemWorkspace.java
+index 3cc418b..d1a626c 100644
+--- a/incrementalbuild/src/main/java/io/takari/incrementalbuild/spi/FilesystemWorkspace.java
++++ b/incrementalbuild/src/main/java/io/takari/incrementalbuild/spi/FilesystemWorkspace.java
+@@ -43,7 +43,7 @@ public class FilesystemWorkspace implements Workspace {
+     if (!isPresent(file)) {
+       return ResourceStatus.REMOVED;
+     }
+-    if (length == file.length() && lastModified == file.lastModified()) {
++    if (length == file.length() && lastModified / 1000 == file.lastModified() / 1000) {
+       return ResourceStatus.UNMODIFIED;
+     }
+     return ResourceStatus.MODIFIED;
+-- 
+2.1.0
+
diff --git a/takari-incrementalbuild.spec b/takari-incrementalbuild.spec
index 88c98a6..5307904 100644
--- a/takari-incrementalbuild.spec
+++ b/takari-incrementalbuild.spec
@@ -1,36 +1,100 @@
+%bcond_with bootstrap
+%global artifact_name io.takari.incrementalbuild
+
 Name:           takari-incrementalbuild
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Takari Incremental Build
 License:        EPL
-URL:            https://github.com/takari/io.takari.incrementalbuild
+URL:            http://takari.io
 BuildArch:      noarch
 
-Source0:        https://github.com/takari/io.takari.incrementalbuild/archive/io.takari.incrementalbuild-%{version}.tar.gz
+Source0:        https://github.com/takari/%{artifact_name}/archive/%{artifact_name}-%{version}.tar.gz
+
+Patch0:         0001-Workaround-for-mtime-truncation.patch
 
 BuildRequires:  maven-local
+BuildRequires:  mvn(com.google.guava:guava)
+BuildRequires:  mvn(javax.enterprise:cdi-api)
+BuildRequires:  mvn(javax.inject:javax.inject)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-model)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.eclipse.aether:aether-api)
+BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
+BuildRequires:  mvn(org.slf4j:slf4j-simple)
+BuildRequires:  mvn(org.sonatype.plugins:sisu-maven-plugin)
+BuildRequires:  mvn(org.sonatype.sisu:sisu-guice)
 
+
+%if ! %{with bootstrap}
 BuildRequires:  mvn(io.takari:takari:pom:)
+%endif
+
 
 %description
-TODO
+Incremental build support library for Apache Maven.
+
+%package javadoc
+Summary:        API documentation for %{name}
+
+%description javadoc
+This package provides %{summary}.
+
 
 %prep
-%setup -q -n io.takari.incrementalbuild-io.takari.incrementalbuild-%{version}
+%setup -q -n %{artifact_name}-%{artifact_name}-%{version}
+
+%patch0 -p1
 
 # XXX skip ITs for now
 %pom_disable_module incrementalbuild-its
 
+# Component with different release cycle that upstream keeps disabled, but is needed
+%pom_xpath_inject pom:modules '<module>incrementalbuild-workspace</module>'
+%pom_set_parent io.takari:io.takari.incrementalbuild:%{version} incrementalbuild-workspace
+%pom_change_dep :incrementalbuild-workspace ::%{version} incrementalbuild
+
+%pom_remove_plugin -r :animal-sniffer-maven-plugin
+
+%if %{with bootstrap}
+%pom_remove_parent
+%pom_xpath_set pom:project/pom:packaging jar incrementalbuild incrementalbuild-workspace
+%pom_add_plugin :maven-compiler-plugin '
+<configuration>
+<source>1.7</source>
+<target>1.7</target>
+</configuration>'
+%endif
+
+# XXX optional
+%pom_remove_dep -r :takari-plugin-testing
+rm -rf incrementalbuild/src/main/java/io/takari/incrementalbuild/maven/testing
+
 %build
-%mvn_build
+%mvn_build -f
 
 %install
 %mvn_install
 
+
 %files -f .mfiles
 %license LICENSE.txt
 %doc README.md
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
+
 %changelog
+* Fri Mar 06 2015 Michael Simacek <msimacek at redhat.com> - 0.10.0-2
+- Working build
+
 * Fri Feb 20 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10.0-1
 - Initial packaging


More information about the scm-commits mailing list