[miglayout] Update to 4.2 release
Hans de Goede
jwrdegoede at fedoraproject.org
Wed Oct 22 18:37:25 UTC 2014
commit a3e72f1f665c13c523ff0b27a21e150c77b7396f
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Oct 22 20:37:27 2014 +0200
Update to 4.2 release
- Drop SWT support, as it is split out into a separate sources jar upstream
- Drop examples, as they are split out into a separate sources jar upstream
.gitignore | 2 +
miglayout.spec | 58 +++++++++++++++++++++----------------------------------
sources | 3 +-
3 files changed, 26 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6178a88..c223a90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/miglayout-3.7.3.1-sources.jar
/miglayout-4.0-sources.jar
+/miglayout-core-4.2-sources.jar
+/miglayout-swing-4.2-sources.jar
diff --git a/miglayout.spec b/miglayout.spec
index a760315..2536714 100644
--- a/miglayout.spec
+++ b/miglayout.spec
@@ -1,80 +1,66 @@
Name: miglayout
-Version: 4.0
-Release: 7%{?dist}
-Summary: Versatile and flexible Swing and SWT layout manager
+Version: 4.2
+Release: 1%{?dist}
+Summary: Versatile and flexible Swing layout manager
URL: http://www.miglayout.com/
License: BSD
-Source0: http://www.migcalendar.com/miglayout/versions/%{version}/miglayout-%{version}-sources.jar
+# Hidden in maven.org labyrinth, so no download URL's
+Source0: miglayout-core-4.2-sources.jar
+Source1: miglayout-swing-4.2-sources.jar
BuildArch: noarch
-BuildRequires: eclipse-swt dos2unix jpackage-utils java-devel
+BuildRequires: java-devel
Requires: java
%description
-MiGLayout is a versatile SWT/Swing layout manager. It uses String or
+MiGLayout is a versatile Swing layout manager. It uses String or
API type-checked constraints to format the layout. MiGLayout can
produce flowing, grid based, absolute (with links), grouped and
docking layouts. MiGLayout is created to be to manually coded layouts
what Matisse/GroupLayout is to IDE supported visual layouts.
+
%package javadoc
Summary: Javadocs for MiGLayout
%description javadoc
This package contains the API documentation for MiGLayout.
-%package examples
-Summary: Examples and demo code for MiGLayout
-Requires: %{name} = %{version}-%{release}
-
-%description examples
-This package contains examples and demos code for MiGLayout.
%prep
%setup -q -c %{name}
-# Fix line endings in some demo and example source files.
-dos2unix net/miginfocom/demo/{CallbackDemo,SwingDemo,SwtDemo}.java
-dos2unix net/miginfocom/examples/{Example01,Example,ExampleGood}.java
-# Convert Windows codepage 1251 quotes in SwtDemo.java to UTF-8.
-iconv --from=windows-1251 --to=UTF-8 net/miginfocom/demo/SwtDemo.java >net/miginfocom/demo/SwtDemo.java.new
-touch -r net/miginfocom/demo/SwtDemo.java{,.new}
-mv net/miginfocom/demo/SwtDemo.java{.new,}
+unzip -oq %{SOURCE1}
+
%build
-export CLASSPATH=%{_libdir}/java/swt.jar:.
-javac -encoding utf8 net/miginfocom/{layout,swing,swt}/*.java
+javac -encoding utf8 net/miginfocom/{layout,swing}/*.java
-# We'll build the demos and examples just to ensure that they compile,
-# but we're not going to package the binaries.
-# We can't build demo/HiDPISimulator.java due to a missing prerequisite
-# (org.jvnet.substance).
-javac -encoding utf8 net/miginfocom/demo/[CS]*.java
-javac -encoding utf8 net/miginfocom/examples/*.java
+jar cmf META-INF/MANIFEST.MF %{name}-core.jar net/miginfocom/layout/*.class
+jar cmf META-INF/MANIFEST.MF %{name}-swing.jar net/miginfocom/swing/*.class
+javadoc -d doc net.miginfocom.{layout,swing}
-jar cmf META-INF/MANIFEST.MF \
- %{name}-%{version}.jar \
- net/miginfocom/{layout,swing,swt}/*.class
-javadoc -d doc net.miginfocom.{layout,swing,swt}
%install
mkdir -p %{buildroot}%{_javadir}
mkdir -p %{buildroot}%{_javadocdir}
-cp -a %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+cp -a %{name}-*.jar %{buildroot}%{_javadir}
cp -a doc %{buildroot}%{_javadocdir}/%{name}
+
%files
%{_javadir}/*.jar
%files javadoc
%doc %{_javadocdir}/%{name}
-%files examples
-%doc net/miginfocom/demo/*.java
-%doc net/miginfocom/examples/*.java
-
%changelog
+* Wed Oct 22 2014 Hans de Goede <hdegoede at redhat.com> - 4.2-1
+- Update to 4.2 release
+- Drop SWT support, as it is split out into a separate sources jar upstream
+- Drop examples, as they are split out into a separate sources jar upstream
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 424c1f7..ecf3e48 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-69cdbae093bcfe26727be36faf8b5661 miglayout-4.0-sources.jar
+9224458767b60ae43a51814c73007d7e miglayout-core-4.2-sources.jar
+5e12cb8bd0ad14f5e666ca2bde29d5e9 miglayout-swing-4.2-sources.jar
More information about the scm-commits
mailing list