diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index ba2456a4367793fe5abf4296ab4bbc77d45f248f..b4bd62b5d60826f73322e0ed15d1bd287167be26 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -1,9 +1,9 @@
%global debug_package %{nil}
-%define git_release HEAD
+%define git_release 1010092232_b313272
Summary: A social network server
Name: diaspora
-Version: 0.0.1
+Version: 0.0
Release: 1.%{git_release}%{?dist}
License: AGPLv3
Group: Applications/Communications
@@ -19,7 +19,7 @@ BuildRoot: %{_rmpdir}/not-used-in-fedora/
Requires: mongodb-server
Requires: ruby(abi) = 1.8
-Requires: diaspora-bundle = %{version}
+Requires: diaspora-bundle = 0.0-1.1010081636_d1a4ee0.fc13
%description
@@ -34,10 +34,6 @@ find . -perm /u+x -type f -exec \
%build
rm -rf master/vendor/bundle
-<<<<<<< HEAD
-mkdir master/tmp || :
-=======
->>>>>>> upstream/master
%install
rm -fr $RPM_BUILD_ROOT
@@ -59,14 +55,7 @@ cp %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
-<<<<<<< HEAD
-cp -ar master/.bundle $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
-cp diaspora-setup $RPM_BUILD_ROOT/%{_datadir}/diaspora
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/tmp
-=======
cp %SOURCE2 $RPM_BUILD_ROOT/%{_datadir}/diaspora
->>>>>>> upstream/master
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/diaspora
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
@@ -91,25 +80,8 @@ sed -i -e '\|.*/master/config.ru"$|d' \
%post
-<<<<<<< HEAD
-rm -f %{_datadir}/diaspora/master/vendor/bundle
-rm -f %{_datadir}/diaspora/master/log
-rm -f %{_datadir}/diaspora/master/public/uploads
-rm -rf %{_datadir}/diaspora/master/tmp
-
-ln -s %{_localstatedir}/log/diaspora \
- %{_datadir}/diaspora/master/log || :
-ln -s %{_libdir}/diaspora-bundle/master/vendor/bundle \
- %{_datadir}/diaspora/master/vendor || :
-ln -s %{_localstatedir}/lib/diaspora/uploads \
- %{_datadir}/diaspora/master/public/uploads || :
-ln -s %{_localstatedir}/lib/diaspora/tmp \
- %{_datadir}/diaspora/master/tmp || :
-/sbin/chkconfig --add diaspora-ws || :
-=======
/sbin/chkconfig --add diaspora-wsd
->>>>>>> upstream/master
%preun
if [ $1 -eq 0 ] ; then
@@ -124,27 +96,21 @@ rm -fr $RPM_BUILD_ROOT
%files -f files
%defattr(-, root, root, 0755)
-<<<<<<< HEAD
-%doc README.md GNU-AGPL-3.0
-=======
%doc AUTHORS README.md GNU-AGPL-3.0 COPYRIGHT README-Fedora.md
->>>>>>> upstream/master
%attr(-, diaspora, diaspora) %{_datadir}/diaspora/master/config.ru
%attr(-, diaspora, diaspora) %{_datadir}/diaspora/master/config/environment.rb
%attr(-, diaspora, diaspora) %{_localstatedir}/log/diaspora
%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/uploads
%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/tmp
-<<<<<<< HEAD
-=======
%{_datadir}/diaspora/master/tmp
%{_datadir}/diaspora/master/public/uploads
%{_datadir}/diaspora/master/log
->>>>>>> upstream/master
%config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
%{_sysconfdir}/init.d/diaspora-wsd
%changelog
-* Fri Sep 24 2010 Alec Leamas <leamas.alec@gmail.com> 0.0-1.1009280542_859ec2d
+* Fri Sep 24 2010 Alec Leamas <leamas.alec@gmail.com> 0.0-1.1010092232_b313272.fc13
+
- Initial attempt to create a spec fi+le
# rubygem-term-ansicolor in repo (1.0.5)