rpms/eclipse-changelog/devel eclipse-changelog-2.6.1.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 eclipse-changelog.spec, 1.65, 1.66 sources, 1.25, 1.26
Jeff Johnston (jjohnstn)
fedora-extras-commits at redhat.com
Thu Apr 3 17:15:37 UTC 2008
Author: jjohnstn
Update of /cvs/pkgs/rpms/eclipse-changelog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25524
Modified Files:
.cvsignore eclipse-changelog.spec sources
Added Files:
eclipse-changelog-2.6.1.patch
Log Message:
* Mon Jan 21 2008 Jeff Johnston <jjohnstn at redhat.com> 1:2.6.1-3
- fix regressions to GNU formatter, ChangeLog editor
- fix Prepare ChangeLog project menu activation
- allow CRTL+ALT+P from editors
* Wed Jan 16 2008 Jeff Johnston <jjohnstn at redhat.com> 1:2.6.1-2
- fix Obsoletes statements
eclipse-changelog-2.6.1.patch:
--- NEW FILE eclipse-changelog-2.6.1.patch ---
--- org.eclipse.linuxtools.changelog.core/.classpath (revision 8005)
+++ org.eclipse.linuxtools.changelog.core/.classpath (working copy)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
--- org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java (revision 8005)
+++ org.eclipse.linuxtools.changelog.core/src/org/eclipse/linuxtools/changelog/core/ChangelogPlugin.java (working copy)
@@ -107,9 +107,9 @@
store.setDefault("IChangeLogConstants.AUTHOR_EMAIL", // $NON-NLS-2$
ChangeLogPreferencesPage.getUserEmail());
store.setDefault("IChangeLogConstants.DEFAULT_FORMATTER", // $NON-NLS-1$
- getResourceString("gnuFormatter")); // $NON-NLS-1$
+ "gnuFormatter"); // $NON-NLS-1$
store.setDefault("IChangeLogConstants.DEFAULT_EDITOR", // $NON-NLS-1$
- getResourceString("gnuEditorConfig")); // $NON-NLS-1$
+ "gnuEditorConfig"); // $NON-NLS-1$
}
}
--- org.eclipse.linuxtools.changelog.core/plugin.xml (revision 8005)
+++ org.eclipse.linuxtools.changelog.core/plugin.xml (working copy)
@@ -38,6 +38,12 @@
description="Formats ChangeLog"
id="org.eclipse.linuxtools.changelog.core.formatChangeLog"
name="Format ChangeLog"/>
+ <command
+ categoryId="org.eclipse.linuxtools.changelog"
+ description="Prepares ChangeLog in an editor"
+ id="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+ name="Prepare Changelog In Editor">
+ </command>
</extension>
<!-- Actions -->
@@ -73,6 +79,12 @@
</or>
</enablement>
</action>
+ <action
+ class="org.eclipse.linuxtools.changelog.core.actions.PrepareChangelogKeyHandler"
+ definitionId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+ id="org.eclipse.linuxtools.changelog.core.action.prepChangeLogInEditor"
+ label="Prepare ChangeLog In Editor">
+ </action>
</actionSet>
</extension>
@@ -91,7 +103,7 @@
inFile="false"
class="org.eclipse.linuxtools.changelog.core.formatters.GNUFormat"
id="org.eclipse.linuxtools.changelog.GNUFormat"
- name="%gnuFormatter">
+ name="gnuFormatter">
<fileName name="ChangeLog" />
</formatter>
</extension>
@@ -110,7 +122,7 @@
<editor
class="org.eclipse.linuxtools.changelog.core.editors.GNUEditorConfiguration"
id="org.eclipse.linuxtools.changelog.core.gnueditor"
- name="GNU Editor"/>
+ name="gnuEditorConfig"/>
</extension>
<extension
point="org.eclipse.ui.navigator.viewer">
@@ -141,6 +153,12 @@
id="org.eclipse.linuxtools.changelog.keyscheme.default"
name="default"/>
<key
+ commandId="org.eclipse.linuxtools.changelog.core.preparechangelog2"
+ contextId="org.eclipse.ui.textEditorScope"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="Ctrl+Alt+P">
+ </key>
+ <key
commandId="org.eclipse.linuxtools.changelog.core.preparechangelog"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 18 Dec 2007 23:30:35 -0000 1.16
+++ .cvsignore 3 Apr 2008 17:15:00 -0000 1.17
@@ -1,2 +1,3 @@
eclipse-changelog-src-2.5.1.zip
eclipse-changelog-src-2.6.0.zip
+eclipse-changelog-src-2.6.1.zip
Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- eclipse-changelog.spec 19 Feb 2008 06:23:38 -0000 1.65
+++ eclipse-changelog.spec 3 Apr 2008 17:15:00 -0000 1.66
@@ -4,39 +4,45 @@
%define eclipse_base %{_datadir}/eclipse
Name: eclipse-changelog
-Version: 2.6.0
-Release: 2%{?dist}
+Version: 2.6.1
+Release: 3%{?dist}
Summary: Eclipse ChangeLog plug-in
Group: Development/Tools
-License: Eclipse Public License
+License: EPL
URL: http://sources.redhat.com/eclipse
+Obsoletes: eclipse-changelog-cdt < %{epoch}:%{version}-%{release}
+Obsoletes: eclipse-changelog-jdt < %{epoch}:%{version}-%{release}
+
+Provides: eclipse-changelog-cdt = %{epoch}:%{version}-%{release}
+Provides: eclipse-changelog-jdt = %{epoch}:%{version}-%{release}
+
# This tarball was generated like so:
#
-# mkdir eclipse-changelog-src-2.6.0
-# cd eclipse-changelog-src-2.6.0
+# mkdir eclipse-changelog-src-2.6.1
+# cd eclipse-changelog-src-2.6.1
# for f in \
# org.eclipse.linuxtools.changelog.core \
# org.eclipse.linuxtools.changelog.doc \
# org.eclipse.linuxtools.changelog.cparser \
# org.eclipse.linuxtools.changelog.javaparser \
-# org.eclipse.linuxtools.changelog.cparser-feature \
-# org.eclipse.linuxtools.changelog.javaparser-feature \
# org.eclipse.linuxtools.changelog-feature \
# do \
# svn export \
-# svn://anonymous@dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_0/$f;
+# svn://anonymous@dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/changelog/tags/R2_6_1/$f;
# done
-# zip -r eclipse-changelog-src-2.6.0.zip *
+# zip -r eclipse-changelog-src-2.6.1.zip *
Source0: http://sourceware.org/eclipse/changelog/%{name}-src-%{version}.zip
+# Patch required to 2.6.1 sources to fix a number of problems
+Patch1: %{name}-2.6.1.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: eclipse-pde >= 1:3.3.0
BuildRequires: eclipse-cdt >= 1:4.0.0
-BuildRequires: eclipse-cvs-client >= 1:3.3.0
%if %{gcj_support}
BuildRequires: gcc-java >= 4.0.2
BuildRequires: java-gcj-compat-devel
@@ -55,32 +61,16 @@
%endif
Requires: eclipse-platform >= 1:3.3.0
-Requires: eclipse-cvs-client >= 1:3.3.0
%description
The Eclipse ChangeLog package contains Eclipse features and plugins that are
-useful for ChangeLog maintenance within the Eclipse IDE.
-
-%package cdt
-Requires: eclipse-cdt >= 1:4.0.0
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: C/C++ source parser for ChangeLog
-Group: Development/Tools
-
-%description cdt
-Parser for C/C++ files used when writing locations in ChangeLog entries.
-
-%package jdt
-Requires: eclipse-jdt >= 1:3.3.0
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Summary: Java source parser for ChangeLog
-Group: Development/Tools
-
-%description jdt
-Parser for Java files used when writing locations in ChangeLog entries.
+useful for ChangeLog maintenance within the Eclipse IDE. It includes
+fragments for parsing C, C++, and Java source files to create more detailed
+entries containing function or method names.
%prep
%setup -q -c -n eclipse-changelog-%{version}
+%patch1 -p0
%build
# See comments in the script to understand this.
@@ -105,43 +95,11 @@
-Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
-f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
-# build the cdt ChangeLog feature
-java -cp $SDK/startup.jar \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Duser.home=$homedir \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=feature \
- -Did=org.eclipse.linuxtools.changelog.cparser-feature \
- -DsourceDirectory=$(pwd) \
- -DbaseLocation=$SDK \
- -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
- -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
-
-# build the jdt ChangeLog feature
-java -cp $SDK/startup.jar \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Duser.home=$homedir \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=feature \
- -Did=org.eclipse.linuxtools.changelog.javaparser-feature \
- -DsourceDirectory=$(pwd) \
- -DbaseLocation=$SDK \
- -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
- -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
-
%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{eclipse_base}
unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
build/rpmBuild/org.eclipse.linuxtools.changelog.zip
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
- build/rpmBuild/org.eclipse.linuxtools.changelog.cparser-feature.zip
-unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. \
- build/rpmBuild/org.eclipse.linuxtools.changelog.javaparser-feature.zip
%if %{gcj_support}
aot-compile-rpm
@@ -155,42 +113,33 @@
%postun -p %{_bindir}/rebuild-gcj-db
%endif
-%files jdt
-%defattr(-,root,root)
-%dir %{eclipse_base}/features/org.eclipse.linuxtools.changelog.javaparser-feature_*
-%doc %{eclipse_base}/features/org.eclipse.linuxtools.changelog.javaparser-feature_*/epl-v10.html
-%{eclipse_base}/features/org.eclipse.linuxtools.changelog.javaparser-feature_*/feature.xml
-%{eclipse_base}/features/org.eclipse.linuxtools.changelog.javaparser-feature_*/META-INF
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.parsers.java_*.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.changelog.parsers.java_*
-%endif
-
-%files cdt
-%defattr(-,root,root)
-%dir %{eclipse_base}/features/org.eclipse.linuxtools.changelog.cparser-feature_*
-%doc %{eclipse_base}/features/org.eclipse.linuxtools.changelog.cparser-feature_*/epl-v10.html
-%{eclipse_base}/features/org.eclipse.linuxtools.changelog.cparser-feature_*/feature.xml
-%{eclipse_base}/features/org.eclipse.linuxtools.changelog.cparser-feature_*/META-INF
-%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.cparser_*.jar
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.changelog.cparser_*
-%endif
-
%files
%defattr(-,root,root)
%{eclipse_base}/features/org.eclipse.linuxtools.changelog_*
%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.core_*
+%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.cparser_*
+%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.parsers.java_*
%{eclipse_base}/plugins/org.eclipse.linuxtools.changelog.doc_*
%doc %{eclipse_base}/features/org.eclipse.linuxtools.changelog_*/epl-v10.html
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.changelog.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.changelog.cparser_*
+%{_libdir}/gcj/%{name}/org.eclipse.linuxtools.changelog.parsers.java_*
%endif
%changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:2.6.0-2
-- Autorebuild for GCC 4.3
+* Mon Jan 21 2008 Jeff Johnston <jjohnstn at redhat.com> 1:2.6.1-3
+- fix regressions to GNU formatter, ChangeLog editor
+- fix Prepare ChangeLog project menu activation
+- allow CRTL+ALT+P from editors
+
+* Wed Jan 16 2008 Jeff Johnston <jjohnstn at redhat.com> 1:2.6.1-2
+- fix Obsoletes statements
+
+* Mon Jan 14 2008 Jeff Johnston <jjohnstn at redhat.com> 1:2.6.1-1
+- 2.6.1
+- switching cparser and javaparser to be fragments
* Tue Dec 18 2007 Jeff Johnston <jjohnstn at redhat.com> 2.6.0-1
- 2.6.0
@@ -203,7 +152,7 @@
- Fix match recognition for finding existing entries
- For PrepareChangeLog, categorize New, Removed, and Changed entries
and alphabetically sort them in the ChangeLog entry
-- Resolves Bugzilla #210144
+- Resolves Bugzilla #427292
* Thu Aug 16 2007 Andrew Overholt <overholt at redhat.com> 2.5.1-2
- R/BR: eclipse-cvs-client.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 18 Dec 2007 23:30:35 -0000 1.25
+++ sources 3 Apr 2008 17:15:00 -0000 1.26
@@ -1 +1 @@
-a2c11e5e83b8873a3e0b55104b436b07 eclipse-changelog-src-2.6.0.zip
+471c92160b5cca3e4e4251e57e27e6c5 eclipse-changelog-src-2.6.1.zip
More information about the scm-commits
mailing list