Changeset 913

Timestamp:

Dec 31, 2008, 7:34:58 PM (15 years ago)

Author:

quentin

Message:

Remove openSUSEisms from the specfile

File:

• server/fedora/specs/nss-ldapd.spec.patch (modified) (6 diffs)

server/fedora/specs/nss-ldapd.spec.patch

@@ -1 @@
---- nss-ldapd.spec.orig 2008-12-31 18:53:14.000000000 -0500
-+++ nss-ldapd.spec      2008-12-31 18:53:22.000000000 -0500
-@@ -11,16 +11,16 @@
+--- /home/scripts-build/rpmbuild/SPECS/nss-ldapd.spec   2008-08-13 12:48:42.000000000 -0400
++++ ./nss-ldapd.spec    2008-12-31 19:30:37.000000000 -0500
+@@ -11,16 +11,17 @@
  # norootforbuild
  
@@ -7 +7 @@
 -BuildRequires:  db-devel krb5-devel openldap2-devel
 +BuildRequires:  db4-devel krb5-devel openldap-devel autoconf automake libtool
++Conflicts:     nss_ldap
  License:        LGPL v2.1 or later
  Group:          Productivity/Networking/LDAP/Clients
@@ -12 +13 @@
  Version:        0.6.4
 -Release:        2.4
-+Release:        3.0
++Release:        3.1
  Summary:        NSS LDAP Daemon and Module
  URL:            http://ch.tudelft.nl/~arthur/nss-ldapd/
@@ -21 +22 @@
  
  %description
-@@ -34,11 +34,9 @@
+@@ -34,11 +35,9 @@
      West Consulting <info@west.nl>
      Arthur de Jong <arthur@ch.tudelft.nl>
@@ -34 +35 @@
  %build
  %{?suse_update_config:%{suse_update_config -f}}
-@@ -58,7 +56,6 @@
+@@ -58,7 +57,6 @@
  mkdir -p $RPM_BUILD_ROOT/etc/init.d/
  mkdir -p $RPM_BUILD_ROOT/usr/sbin/
@@ -42 +43 @@
  mkdir -p $RPM_BUILD_ROOT/var/run/nslcd
  install -m 644 man/nss-ldapd.conf.5 $RPM_BUILD_ROOT/usr/share/man/man5
-@@ -86,11 +83,14 @@
+@@ -70,13 +68,8 @@
+ %post
+ /sbin/ldconfig
+ 
+-%preun
+-%stop_on_removal nslcd
+-
+ %postun 
+ /sbin/ldconfig
+-%restart_on_update nslcd
+-%insserv_cleanup
+ 
+ %files
+ %defattr(-,root,root)
+@@ -86,11 +79,14 @@
  %doc %{_mandir}/man8/*
  %config(noreplace) /etc/nss-ldapd.conf