[eclipse-fedorapackager: 2/2] Merge branch 'master' of ssh://arobinso at pkgs.fedoraproject.org/eclipse-fedorapackager.git

[Andrew Robinson]

commit cb42fec876d4aae7fc90a1439dcd5a2300c54017
Merge: 1215d0b f92a9f8
Author: Andrew Robinson <arobinso at redhat.com>
Date:   Fri Jan 13 13:34:29 2012 -0500

    Merge branch 'master' of ssh://arobinso@pkgs.fedoraproject.org/eclipse-fedorapackager.git
    
    Conflicts:
    	eclipse-fedorapackager.spec

 eclipse-fedorapackager.spec |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)
---
diff --cc eclipse-fedorapackager.spec
index 4eed6df,faa7397..44cc64a
--- a/eclipse-fedorapackager.spec
+++ b/eclipse-fedorapackager.spec
@@@ -117,9 -117,9 +117,12 @@@ pop
  %doc org.fedoraproject.eclipse.packager-feature/*.html
  
  %changelog
 +* Fri Jan 13 2012 Andrew Robinson <arobinso at redhat.com> 0.2.3-1
 +- Update to 0.2.3.
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Nov 2 2011 Andrew Robinson <arobinso at redhat.com> 0.2.2-3
  - Added BR in line with eclipse-rpmstubby Requires.
  
@@@ -247,3 -247,3 +250,38 @@@
  
  * Tue Jun 22 2010 Severin Gehwolf <sgehwolf at, redhat.com> 0.0.3-1
  - Initial release
++
++Version:	
++Release:	1%{?dist}
++Summary:	
++
++License:	
++URL:		
++Source0:	
++
++BuildRequires:	
++Requires:	
++
++%description
++
++
++%prep
++%setup -q
++
++
++%build
++%configure
++make %{?_smp_mflags}
++
++
++%install
++rm -rf $RPM_BUILD_ROOT
++make install DESTDIR=$RPM_BUILD_ROOT
++
++
++%files
++%doc
++
++
++
++%changelog