[intellij-idea/f14/master] fix broken deps
Tom Callaway
spot at fedoraproject.org
Mon Sep 27 19:12:19 UTC 2010
commit 925c2525f13772715c548a0844d33eeee63f8171
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Mon Sep 27 15:12:14 2010 -0400
fix broken deps
intellij-idea-94.399-fix-jna.patch | 24 ++++++++++++++++++++++++
intellij-idea-idea | 2 +-
intellij-idea.spec | 17 +++++++++++++----
3 files changed, 38 insertions(+), 5 deletions(-)
---
diff --git a/intellij-idea-94.399-fix-jna.patch b/intellij-idea-94.399-fix-jna.patch
new file mode 100644
index 0000000..ab6efb2
--- /dev/null
+++ b/intellij-idea-94.399-fix-jna.patch
@@ -0,0 +1,24 @@
+diff -up idea-94.399/replacerules.txt.BAD idea-94.399/replacerules.txt
+--- idea-94.399/replacerules.txt.BAD 2010-09-27 12:43:14.572191002 -0400
++++ idea-94.399/replacerules.txt 2010-09-27 12:43:27.369191002 -0400
+@@ -144,7 +144,7 @@ lib/eawtstub.jar
+
+ lib/jna-utils.jar
+ # The jna package needs to be patched!
+- jna-examples
++ jna/platform
+
+ lib/serviceMessages.jar
+ # From jetbrains, soruce included
+diff -up idea-94.399/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java.BAD idea-94.399/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
+--- idea-94.399/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java.BAD 2010-09-27 13:03:20.459191001 -0400
++++ idea-94.399/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java 2010-09-27 13:03:25.845191002 -0400
+@@ -40,7 +40,7 @@ import com.intellij.util.Alarm;
+ import com.intellij.util.ArrayUtil;
+ import com.intellij.util.EventDispatcher;
+ import com.intellij.util.ui.UIUtil;
+-import com.sun.jna.examples.WindowUtils;
++import com.sun.jna.platform.WindowUtils;
+ import org.jdom.Element;
+ import org.jetbrains.annotations.NonNls;
+ import org.jetbrains.annotations.NotNull;
diff --git a/intellij-idea-idea b/intellij-idea-idea
index 45114a3..47bba69 100644
--- a/intellij-idea-idea
+++ b/intellij-idea-idea
@@ -65,7 +65,7 @@ BASE_JARS="$BASE_JARS jdom"
BASE_JARS="$BASE_JARS jgoodies-forms"
BASE_JARS="$BASE_JARS jgoodies-looks"
BASE_JARS="$BASE_JARS jna"
-BASE_JARS="$BASE_JARS jna-examples"
+BASE_JARS="$BASE_JARS jna/platform"
BASE_JARS="$BASE_JARS junit"
BASE_JARS="$BASE_JARS junit4"
BASE_JARS="$BASE_JARS log4j"
diff --git a/intellij-idea.spec b/intellij-idea.spec
index 23f4fc9..672e0e6 100644
--- a/intellij-idea.spec
+++ b/intellij-idea.spec
@@ -7,7 +7,7 @@
Name: intellij-idea
Version: %{idea_version}.%{idea_build}
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: IntelliJ IDEA Community Edition IDE
Group: Development/Tools
@@ -50,6 +50,8 @@ Patch15: 0015-Adjust-defaults-for-Fedora.patch
Patch16: 0016-Override-broken-javac-class.patch
Patch17: 0017-Do-not-unnecessarily-delete-compile-output.patch
+Patch18: intellij-idea-94.399-fix-jna.patch
+
%if %without bootstrap
BuildRequires: jps
BuildRequires: intellij-idea
@@ -60,7 +62,7 @@ BuildRequires: antlr
BuildRequires: ant-nodeps
BuildRequires: cglib = 2.2
BuildRequires: classworlds
-BuildRequires: commons-beanutils
+BuildRequires: apache-commons-beanutils
BuildRequires: commons-codec
BuildRequires: commons-collections
BuildRequires: apache-commons-net
@@ -81,7 +83,7 @@ BuildRequires: jdom
BuildRequires: jgoodies-forms
BuildRequires: jgoodies-looks
BuildRequires: jna
-BuildRequires: jna-examples >= 3.0.9
+BuildRequires: jna-contrib >= 3.0.9
BuildRequires: junit
BuildRequires: junit4 >= 4.6
BuildRequires: log4j
@@ -96,6 +98,7 @@ BuildRequires: picocontainer
BuildRequires: plexus-digest
BuildRequires: plexus-utils
BuildRequires: svnkit
+BuildRequires: svnkit-javahl
BuildRequires: testng
BuildRequires: trilead-ssh2
BuildRequires: velocity
@@ -126,7 +129,7 @@ Requires: jdom
Requires: jgoodies-forms
Requires: jgoodies-looks
Requires: jna
-Requires: jna-examples
+Requires: jna-contrib
Requires: junit
Requires: junit4
Requires: log4j
@@ -147,6 +150,7 @@ Requires: xdg-utils
Requires: trilead-ssh2
Requires: gradle-open-api
Requires: svnkit
+Requires: svnkit-javahl
Requires: testng
%description
@@ -202,6 +206,7 @@ unzip -qd eawtstub lib/src/eawtstub_src.zip
%patch16 -p1
%patch17 -p1
+%patch18 -p1
%build
# Fix up build number
@@ -329,6 +334,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 27 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 9.0.1.94.399-12
+- fix jna-examples deps to point to jna-contrib
+- add dep on svnkit-javahl
+
* Sun Jun 27 2010 Lubomir Rintel <lkundrak at v3.sk> - 9.0.1.94.399-11
- Fix the commons-net dependency
More information about the scm-commits
mailing list