[stapler-adjunct-timeline] Enable javascript

[Michal Srb]

commit d7b54c5df9f757b97696cd90240c67d35da9b995
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Sep 26 08:30:56 2014 +0200

    Enable javascript

 .gitignore                    |    1 +
 sources                       |    2 +-
 stapler-adjunct-timeline.spec |   18 ++++++++++++++----
 3 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7f54b1..d9a47ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /stapler-adjunct-timeline-1.4-clean.tar.gz
+/stapler-adjunct-timeline-1.4.tar.gz
diff --git a/sources b/sources
index d58597c..202eecb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04c2034ebb734afaf304d8d7abf80edd  stapler-adjunct-timeline-1.4-clean.tar.gz
+29c3658be5f5ee2eaa1bcc601092b703  stapler-adjunct-timeline-1.4.tar.gz
diff --git a/stapler-adjunct-timeline.spec b/stapler-adjunct-timeline.spec
index bb25362..546bcb8 100644
--- a/stapler-adjunct-timeline.spec
+++ b/stapler-adjunct-timeline.spec
@@ -1,13 +1,20 @@
 Name:           stapler-adjunct-timeline
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Timeline widget support for Stapler web framework
 
-License:        BSD
+# The project is licensed under BSD, but jquery is dual-licensed MIT or GPLv2
+License:        BSD and (MIT or GPLv2)
 URL:            https://github.com/stapler/stapler-adjunct-timeline
 # ./create-tarball.sh
-Source0:        %{name}-%{version}-clean.tar.gz
-Source1:        create-tarball.sh
+#Source0:        %{name}-%{version}-clean.tar.gz
+#Source1:        create-tarball.sh
+
+# FIXME: this tarball bundles jquery
+# Since jquery is not in Fedora yet (#1078371), we'll temporarily use bundled version in upstream tarball
+# There is a temporary FPC exception for anything bundling jquery:
+# https://fedorahosted.org/fpc/ticket/408
+Source0:        https://github.com/stapler/%{name}/archive/%{name}-%{version}.tar.gz
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(javax.servlet:servlet-api)
@@ -40,6 +47,9 @@ This package contains the API documentation for %{name}.
 %doc LICENSE.txt
 
 %changelog
+* Fri Sep 26 2014 Michal Srb <msrb at redhat.com> - 1.4-3
+- Enable javascript
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild