diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec index 8e7a2ef39..9a409f526 100644 --- a/pkg/fedora/diaspora.spec +++ b/pkg/fedora/diaspora.spec @@ -74,6 +74,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d cp diaspora.logconf $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora +cp master/.gitignore $RPM_BUILD_ROOT/%{_datadir}/diaspora/master %post /bin/chown diaspora:diaspora %{_localstatedir}/log/diaspora diff --git a/pkg/fedora/make_dist.sh b/pkg/fedora/make_dist.sh index b2ca4695e..3d5828e30 100755 --- a/pkg/fedora/make_dist.sh +++ b/pkg/fedora/make_dist.sh @@ -115,7 +115,7 @@ function checkout() # Checkout last version of diaspora unless it's already there. # Returns: commit for current branch's HEAD. { - mkdir dist || : + mkdir dist >/dev/null 2>&1 || : ( cd dist test -d diaspora && { @@ -143,7 +143,7 @@ function make_dist cp diaspora.logconf dist/${RELEASE_DIR} cd dist mkdir ${RELEASE_DIR}/master - cp -ar diaspora/* ${RELEASE_DIR}/master + cp -ar diaspora/* diaspora/.gitignore ${RELEASE_DIR}/master mv ${RELEASE_DIR}/master/diaspora.spec ${RELEASE_DIR} tar czf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR} && rm -rf ${RELEASE_DIR} }