- cleanups

Changed files:
    python-psycopg2.spec -> 1.2

diff --git a/python-psycopg2.spec b/python-psycopg2.spec
index e26636d43799ff6831ca34c1f21e5e0602703f4a..82b1780af5a89cb08a2574d3cbe729121f2f3843 100644 (file)
--- a/python-psycopg2.spec
+++ b/python-psycopg2.spec
@@ -1,24 +1,24 @@
 
 %include       /usr/lib/rpm/macros.python
 %define        module psycopg
-%define        version 1.0.12
-
-%define        release 0.9
 
 Summary:       psycopg is a PostgreSQL database adapter for Python
-Summary(pl):   psycopg jest przeznaczyonym dla Pythona interfejsem do bazy PostgreSQL
+Summary(pl):   psycopg jest przeznaczonym dla Pythona interfejsem do bazy PostgreSQL
 Name:          python-%{module}
-Version:       %{version}
-Release:       %{release}
+Version:       1.0.12
+Release:       0.9
+License:       GPL
+Group:         Applications/Databases
 Source0:       http://initd.org/pub/software/%{module}/%{module}-%{version}.tar.gz
 Patch0:                %{name}-dumb-ac-fix.patch
-
-Copyright:     GNU GPL
-Group:         Applications/Databases
+URL:           http://www.initd.org/software/psycopg/
+BuildRequires: postgresql-backend-devel
+BuildRequires: python-devel
+BuildRequires: python-mx-DateTime-devel
+Requires:      postgresql-libs
+Requires:      python
+Requires:      python-egenix-mx-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Url:           http://www.initd.org/software/psycopg/
-BuildRequires: python-devel postgresql-backend-devel python-mx-DateTime-devel
-Requires:      python python-egenix-mx-base postgresql-libs
 
 %description
 psycopg is a PostgreSQL database adapter for the Python programming
@@ -29,12 +29,11 @@ DBAPI-2.0 and being thread safe at level 2.
 
 %description -l pl
 psycopg jest przeznaczonym dla Pythona interfejsem do bazy danych
-Postgresql (tak jak pygrsql i popy). Zosta³ zakodowany od pocz±tku
+PostgreSQL (tak jak pygresql i popy). Zosta³ zakodowany od pocz±tku
 z za³o¿eniem ¿e ma byæ bardzo ma³y, szybki i stabilny. G³ówna zalet±
 psycopg jest, ¿e w jest pe³ni zgodny z standardem DBAPI-2.0 i jest
 'thread safe' na poziomie 2.
 
-
 %prep
 %setup -q -n %{module}-%{version}
 %patch0 -p1
@@ -42,24 +41,22 @@ psycopg jest, 
 %build
 %{__autoconf}
 
-%configure --with-python=%{_bindir}/python \
-      --with-mxdatetime-includes=%{py_sitedir}/mx/DateTime/mxDateTime  \
-      --with-postgres-includes=%{_includedir}/postgresql/server
+%configure \
+       --with-python=%{_bindir}/python \
+       --with-mxdatetime-includes=%{py_sitedir}/mx/DateTime/mxDateTime  \
+       --with-postgres-includes=%{_includedir}/postgresql/server
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{py_sitedir}
-install -m 555 psycopgmodule.so $RPM_BUILD_ROOT%{py_sitedir}
 
+install psycopgmodule.so $RPM_BUILD_ROOT%{py_sitedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{py_sitedir}/*.so
-
-#%files doc
-%defattr(644,root,root,755)
-%doc AUTHORS  COPYING  CREDITS  FAQ  INSTALL  NEWS  README  RELEASE-1.0  SUCCESS  TODO doc
+%doc AUTHORS CREDITS FAQ NEWS README RELEASE-1.0 SUCCESS TODO doc
+%attr(755,root,root) %{py_sitedir}/*.so