[desktopcouch/f18: 3/3] Last version.

[Christopher Meng]

commit 91d258df263c4450418d1fba9c63bb7c4b662ce9
Author: Christopher Meng <rpm at cicku.me>
Date:   Thu Sep 5 22:32:46 2013 +0800

    Last version.

 .gitignore        |    1 +
 desktopcouch.spec |   47 +++++++++++++++++------------------------------
 sources           |    2 +-
 3 files changed, 19 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 09ab91c..6940a92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 desktopcouch-0.6.6.tar.gz
 /desktopcouch-0.6.9b.tar.gz
 /desktopcouch-1.0.7.tar.gz
+/desktopcouch-1.0.8.tar.gz
diff --git a/desktopcouch.spec b/desktopcouch.spec
index 2435901..243d177 100644
--- a/desktopcouch.spec
+++ b/desktopcouch.spec
@@ -1,22 +1,15 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-
 Name:           desktopcouch
-Version:        1.0.7
-Release:        5%{?dist}
-
+Version:        1.0.8
+Release:        1%{?dist}
 Summary:        A CouchDB instance on every desktop
-Group:          Development/Languages
 License:        LGPLv3
 URL:            https://launchpad.net/desktopcouch
-Source:         http://launchpad.net/desktopcouch/trunk/%{version}/+download/desktopcouch-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  python-devel
+Source:         https://launchpad.net/desktopcouch/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-distutils-extra
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
-
 Requires:       python-twisted-core
 Requires:       couchdb
 %if 0%{?fedora} >= 13
@@ -24,28 +17,25 @@ Requires:	avahi-ui-tools
 %else
 Requires:       avahi-tools
 %endif
-
 Requires:       python-desktopcouch = %{version}-%{release}
-
 BuildArch:      noarch
 
 %description
 A CouchDB on every desktop, and the code to help it happen.
 
-%package tools
+%package        tools
 Summary:        Tools for desktopcouch
 Requires:       pygtk2
 Requires:       python-desktopcouch = %{version}-%{release}
 Requires:       desktop-file-utils
 
-%description tools
+%description    tools
 This package contains tools for desktopcouch.
 
-%package -n python-desktopcouch
+%package -n     python-%{name}
 Summary:        Python bindings for desktopcouch
 Provides:       python-desktopcouch-records = %{version}-%{release}
 Obsoletes:      python-desktopcouch-records < 1.0.7-1
-
 Requires:       desktopcouch = %{version}-%{release}
 Requires:       dbus-python
 Requires:       python-couchdb
@@ -61,23 +51,20 @@ These are the python bindings for desktopcouch.
 %setup -q
 
 %build
-%{__sed} -i -e 's@/usr/lib/desktopcouch/@%{_bindir}/@' org.desktopcouch.CouchDB.service
-env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
+sed -i -e 's@/usr/lib/desktopcouch/@%{_bindir}/@' org.desktopcouch.CouchDB.service
+env CFLAGS="%{optflags}" python setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+python setup.py install --root=%{buildroot} --record=INSTALLED_FILES
 
 # remove installed docs, we will doc them later
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+rm -rf %{buildroot}%{_datadir}/doc
 
 # Really? You put them there? In /usr/lib (note, not %{_libdir})? Fail.
 mv %{buildroot}/usr/lib/desktopcouch/desktopcouch-* %{buildroot}%{_bindir}\
 
-desktop-file-validate %{buildroot}/%{_datadir}/applications/desktopcouch-pair.desktop
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/desktopcouch-pair.desktop
 
 %post tools
 update-desktop-database -q
@@ -86,8 +73,7 @@ update-desktop-database -q
 update-desktop-database -q
 
 %files
-%defattr(-,root,root)
-%doc README COPYING COPYING.LESSER
+%doc COPYING COPYING.LESSER README
 %dir %{_sysconfdir}/xdg/desktop-couch
 %config(noreplace) %{_sysconfdir}/xdg/desktop-couch/compulsory-auth.ini
 %{_bindir}/desktopcouch-service
@@ -97,19 +83,20 @@ update-desktop-database -q
 %{_datadir}/desktopcouch
 
 %files tools
-%defattr(-,root,root)
 %{_bindir}/desktopcouch-pair
 %{_datadir}/applications/desktopcouch-pair.desktop
 %{_mandir}/man1/desktopcouch-pair.1*
 
 %files -n python-desktopcouch
-%defattr(-,root,root)
 %doc desktopcouch/records/doc/*.txt
 %doc desktopcouch/recordtypes/contacts/*.txt
 %{python_sitelib}/desktopcouch-*egg-info
 %{python_sitelib}/desktopcouch
 
 %changelog
+* Thu Sep 05 2013 Christopher Meng <rpm at cicku.me> - 1.0.8-1
+- Update to new version.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 8ee4335..05a725d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7e5c65bd57ef85b1347ce8aeb1498fc  desktopcouch-1.0.7.tar.gz
+21d43fa1fc564f933a186610974620e1  desktopcouch-1.0.8.tar.gz