rpms/eclipse-changelog/F-8 .cvsignore, 1.16, 1.17 eclipse-changelog.spec, 1.64, 1.65 sources, 1.25, 1.26

Jeff Johnston (jjohnstn) fedora-extras-commits at redhat.com
Mon Jan 14 21:52:19 UTC 2008 

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-changelog/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32479

Modified Files:
	.cvsignore eclipse-changelog.spec sources 
Log Message:

* 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





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	18 Dec 2007 23:32:25 -0000	1.16
+++ .cvsignore	14 Jan 2008 21:51:41 -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/F-8/eclipse-changelog.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- eclipse-changelog.spec	18 Dec 2007 23:32:25 -0000	1.64
+++ eclipse-changelog.spec	14 Jan 2008 21:51:41 -0000	1.65
@@ -4,31 +4,35 @@
 %define eclipse_base    %{_datadir}/eclipse
 
 Name:           eclipse-changelog
-Version:        2.6.0
+Version:        2.6.1
 Release:        1%{?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 <= 1:2.6.0-1
+Obsoletes:      eclipse-changelog-jdt <= 1:2.6.0-1
+
+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
 
@@ -36,7 +40,6 @@
 
 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,29 +58,12 @@
 %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}
@@ -105,43 +91,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,40 +109,26 @@
 %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
+* 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
 - Remove CVS dependency for plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-changelog/F-8/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	18 Dec 2007 23:32:25 -0000	1.25
+++ sources	14 Jan 2008 21:51:41 -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 fedora-extras-commits mailing list