Mass letter "o" and "p" update, one or more apply :

- Drop epoch: 0
- Remove %{epoch} requirements in sub-packages
- Remove trailing white spaces
- Keep consistent between spaces and tabs
This commit is contained in:
Matthias Saou 2005-03-03 23:53:13 +00:00
parent 87ee4f5598
commit 0364da63d5

View File

@ -1,21 +1,20 @@
# $Id: openslp.spec,v 1.4 2004/12/10 22:03:07 mschwendt Exp $ # $Id: openslp.spec,v 1.5 2005/03/03 23:53:13 thias Exp $
%define pie 1 %define pie 1
Summary: OpenSLP implementation of Service Location Protocol V2 Summary: Open implementation of Service Location Protocol V2
Name: openslp Name: openslp
Epoch: 0
Version: 1.2.0 Version: 1.2.0
Release: 4%{?dist_tag} Release: 4%{?dist_tag}
Group: System Environment/Libraries Group: System Environment/Libraries
License: BSD License: BSD
#URL: http://www.openslp.org/ #URL: http://www.openslp.org/
URL: http://sourceforge.net/projects/openslp/ URL: http://sourceforge.net/projects/openslp/
Source: http://dl.sourceforge.net/sourceforge/openslp/openslp-1.2.0.tar.gz Source: http://dl.sourceforge.net/sourceforge/openslp/openslp-1.2.0.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Source1: slpd.init Source1: slpd.init
Patch1: openslp-1.2.0-optflags.patch Patch1: openslp-1.2.0-optflags.patch
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: bison flex BuildRequires: bison flex
@ -28,20 +27,20 @@ provides a framework to allow networking applications to discover the
existence, location, and configuration of networked services in existence, location, and configuration of networked services in
enterprise networks. enterprise networks.
OpenSLP is an open source implementation of the SLPv2 protocol as defined OpenSLP is an open source implementation of the SLPv2 protocol as defined
by RFC 2608 and RFC 2614. by RFC 2608 and RFC 2614.
%package devel %package devel
Summary: OpenSLP headers and libraries Summary: OpenSLP headers and libraries
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{version}-%{release}
%description devel %description devel
OpenSLP header files and libraries. OpenSLP header files and libraries.
%package server %package server
Summary: OpenSLP server daemon Summary: OpenSLP server daemon
Group: System Environment/Daemons Group: System Environment/Daemons
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires(preun): chkconfig /sbin/service Requires(preun): chkconfig /sbin/service
Requires(post): chkconfig Requires(post): chkconfig
Requires(postun): /sbin/service Requires(postun): /sbin/service
@ -50,7 +49,7 @@ OpenSLP server daemon to dynamically register services.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .optflags %patch1 -p1 -b .optflags
@ -87,8 +86,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
install -p -D -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/slpd install -p -D -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/slpd
# nuke unpackaged/unwanted files # nuke unpackaged/unwanted files
rm -rf $RPM_BUILD_ROOT/usr/doc rm -rf $RPM_BUILD_ROOT/usr/doc
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%clean %clean
@ -113,7 +112,7 @@ if [ $1 -ge 1 ]; then
fi fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING FAQ NEWS README THANKS %doc AUTHORS COPYING FAQ NEWS README THANKS
%doc doc/html/IntroductionToSLP %doc doc/html/IntroductionToSLP
@ -132,7 +131,7 @@ fi
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc doc/html/ProgrammersGuide %doc doc/html/ProgrammersGuide
%doc doc/rfc %doc doc/rfc
%{_includedir}/* %{_includedir}/*
%{_libdir}/lib*.so %{_libdir}/lib*.so
@ -150,7 +149,7 @@ fi
* Thu Jul 15 2004 Rex Dieter <rexdieter at sf.net> 0:1.2.0-0.fdr.1 * Thu Jul 15 2004 Rex Dieter <rexdieter at sf.net> 0:1.2.0-0.fdr.1
- 1.2.0 - 1.2.0
- use -pie - use -pie
- don't use Requires(post,postun) - don't use Requires(post,postun)
* Fri Oct 24 2003 Rex Dieter <rexdieter af sf.net> 0:1.0.11-0.fdr.7 * Fri Oct 24 2003 Rex Dieter <rexdieter af sf.net> 0:1.0.11-0.fdr.7
@ -176,7 +175,7 @@ fi
* Thu May 1 2003 Rex Dieter <rexdieter at sf.net> 0:1.0.11-0.fdr.2 * Thu May 1 2003 Rex Dieter <rexdieter at sf.net> 0:1.0.11-0.fdr.2
- docs: remove CVS files, include rfc, move ProgrammersGuide to -devel. - docs: remove CVS files, include rfc, move ProgrammersGuide to -devel.
- improve sub-pkg descriptions. - improve sub-pkg descriptions.
- improve server %%preun,%%postun scripts: condrestart on upgrade, - improve server %%preun,%%postun scripts: condrestart on upgrade,
suppress output of server shutdown,restarts. suppress output of server shutdown,restarts.
* Thu May 1 2003 Rex Dieter <rexdieter at sf.net> 0:1.0.11-0.fdr.1 * Thu May 1 2003 Rex Dieter <rexdieter at sf.net> 0:1.0.11-0.fdr.1