[fpaste-server] updated to v0.2

Clint Savage herlo at fedoraproject.org
Wed Aug 10 19:54:53 UTC 2011


commit 5dae88c244b1a2c5453150c5514e0399629d94fd
Author: Clint Savage <herlo1 at gmail.com>
Date:   Wed Aug 10 13:51:00 2011 -0600

    updated to v0.2

 .gitignore         |    1 +
 fpaste-server.spec |   17 ++++++++++-------
 sources            |    2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b40cf78..421f2a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /fpaste-server-0.1.tar.gz
+/fpaste-server-0.2.tar.gz
diff --git a/fpaste-server.spec b/fpaste-server.spec
index 835f16f..cfda34a 100644
--- a/fpaste-server.spec
+++ b/fpaste-server.spec
@@ -4,9 +4,9 @@
 %endif
 
 %define name fpaste-server
-%define version 0.1
-%define unmangled_version 0.1
-%define release 3
+%define version 0.2
+%define unmangled_version 0.2
+%define release 1
 
 Name: %{name}
 Version: %{version}
@@ -42,11 +42,11 @@ share code and other information collaboratively.
 python setup.py build
 
 %install
-python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
 chmod a+x %{buildroot}%{python_sitelib}/fpaste_server/manage.py
-sed -i 's|#python_path#|%{python_sitelib}|g' %{buildroot}%{python_sitelib}/fpaste_server/conf/fpaste_server.conf
+sed -i 's|#python_path#|%{python_sitelib}|g' %{buildroot}%{python_sitelib}/fpaste_server/conf/fpaste_server.conf.sample
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
-mv %{buildroot}%{python_sitelib}/fpaste_server/conf/fpaste_server.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/fpaste_server.conf
+mv %{buildroot}%{python_sitelib}/fpaste_server/conf/fpaste_server.conf.sample %{buildroot}%{_sysconfdir}/httpd/conf.d/fpaste_server.conf.sample
 # uses the dpaste path structure and needs a symbolic link to work
 ln -sf %{python_sitelib}/fpaste_server/templates/fpaste_server %{buildroot}/%{python_sitelib}/fpaste_server/templates/dpaste
 
@@ -57,10 +57,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc README 
 %{python_sitelib}/*
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/fpaste_server.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/fpaste_server.conf.sample
 
 %changelog
 
+* Mon Aug 10 2011 Clint Savage <herlo at fedoraproject.org> 0.2-1
+- Cleaned up pathing and config files
+
 * Mon Apr 11 2011 Clint Savage <herlo at fedoraproject.org> 0.1-3
 - Added dist macro to release line.
 
diff --git a/sources b/sources
index a40c014..c5e51c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-349d9644f4538b459542d20ef55940e1  fpaste-server-0.1.tar.gz
+d0f602f126cc4458bb5fb87bac130fa6  fpaste-server-0.2.tar.gz


More information about the scm-commits mailing list