CVS User Account cvsuser
Mon Jul 17 09:27:06 PDT 2006
Log Message:
-----------

- Updated spec and cleaned up rpmlint errors and warnings

Modified Files:
--------------
    slony1-engine:
        postgresql-slony1-engine.spec.in (r1.29 -> r1.30)

-------------- next part --------------
Index: postgresql-slony1-engine.spec.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/postgresql-slony1-engine.spec.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.29 -r1.30
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -5,16 +5,16 @@
 
 %define pg_version   %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
 
-Summary:	A "master to multiple slaves" replication system with cascading and failover.
+Summary:	A "master to multiple slaves" replication system with cascading and failover
 Name:           @PACKAGE_NAME@
 Version:        @PACKAGE_VERSION@
-Release:        1_PG%{pg_version}
-License:        Berkeley/BSD
+Release:        2_PG%{pg_version}
+License:        BSD
 Group:          Applications/Databases
 URL:            http://slony.info/
-Packager:       Devrim Gunduz <devrim at PostgreSQL.org>
+Packager:       Devrim Gunduz <devrim at commandprompt.com>
 Source0:        @PACKAGE_NAME at -%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	postgresql-devel
 Requires:	postgresql-server = %{pg_version}
 
@@ -71,36 +71,36 @@
 
 autoconf
 
-make
+make %{?_smp_mflags}
 %if %perltools
- make -C tools
+        make %{?_smp_mflags} -C tools
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT%{_datadir}/pgsql/
 install -d $RPM_BUILD_ROOT%{_libdir}/pgsql/
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 install -m 0755 src/backend/slony1_funcs.so $RPM_BUILD_ROOT%{_libdir}/pgsql/slony1_funcs.so
 install -m 0755 src/xxid/xxid.so $RPM_BUILD_ROOT%{_libdir}/pgsql/xxid.so
-install -m 0755 src/backend/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
-install -m 0755 src/xxid/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
+install -m 0644 src/backend/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
+install -m 0644 src/xxid/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
 install -m 0755 tools/*.sh  $RPM_BUILD_ROOT%{_bindir}/
-install -m 0755 share/slon.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/slon.conf
+install -m 0644 share/slon.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/slon.conf
 
 %if %perltools
 cd tools
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 /bin/rm -rf altperl/*.pl altperl/ToDo altperl/README altperl/Makefile altperl/CVS
-install -m 0755 altperl/slon_tools.conf-sample  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf
+install -m 0644 altperl/slon_tools.conf-sample  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf
 install -m 0755 altperl/* $RPM_BUILD_ROOT%{_bindir}/
-install -m 0755 altperl/slon-tools  $RPM_BUILD_ROOT%{_libdir}/pgsql/slon-tools.pm
+install -m 0644 altperl/slon-tools  $RPM_BUILD_ROOT%{_libdir}/pgsql/slon-tools
 /bin/rm -f  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf-sample
 /bin/rm -f  $RPM_BUILD_ROOT%{_bindir}/slon_tools.conf-sample
-/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/slon-tools.pm
+/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/slon-tools.pm
 /bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools.pm
+/bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools
 %endif
 
 %clean
@@ -108,23 +108,24 @@
 
 %files
 %defattr(-,root,root,-)
+%doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE-1.1.5
+%if %docs
+%doc doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
+%endif
 %{_bindir}/*
 %{_libdir}/pgsql/slony1_funcs.so
 %{_libdir}/pgsql/xxid.so
 %{_datadir}/pgsql/*.sql
 %config(noreplace) %{_sysconfdir}/slon.conf
 %if %perltools
-%{_libdir}/pgsql/slon-tools.pm
+%{_libdir}/pgsql/slon-tools
 %config(noreplace) %{_sysconfdir}/slon_tools.conf
 %endif
 
-%if %docs
-%files docs
-%defattr(-,root,root)
-%doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
-%endif
-
 %changelog
+* Mon Jul 17 2006 Devrim Gunduz <devrim at CommandPrompt.com> postgresql-slony1-engine
+- Updated spec and cleaned up rpmlint errors and warnings
+
 * Wed Dec 21 2005 Devrim Gunduz <devrim at commandprompt.com> postgresql-slony1-engine
 - Added a buildrhel3 macro to fix RHEL 3 RPM builds
 - Added a kerbdir macro



More information about the Slony1-commit mailing list