rpms/openslp/devel openslp-1.2.1-optflags.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 openslp.spec, 1.7, 1.8 slpd.init, 1.1, 1.2 sources, 1.3, 1.4 openslp-1.2.0-optflags.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Oct 21 18:56:59 UTC 2005
Author: rdieter
Update of /cvs/extras/rpms/openslp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254
Modified Files:
.cvsignore openslp.spec slpd.init sources
Added Files:
openslp-1.2.1-optflags.patch
Removed Files:
openslp-1.2.0-optflags.patch
Log Message:
* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.1-1
- 1.2.1
- move most docs to -server
- --enable-slpv2-security
- --disable-dependency-tracking
openslp-1.2.1-optflags.patch:
--- NEW FILE openslp-1.2.1-optflags.patch ---
--- openslp-1.2.1/configure.in.optflags 2005-02-15 14:06:02.000000000 -0600
+++ openslp-1.2.1/configure.in 2005-03-04 06:53:02.000000000 -0600
@@ -130,7 +130,7 @@
CFLAGS="$CFLAGS -Werror"
fi
if test X"$debug" = X"no"; then
- OPTFLAGS="-O3"
+ OPTFLAGS="-O3 $RPM_OPT_FLAGS"
fi
elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
--- openslp-1.2.1/configure.optflags 2005-03-02 12:00:28.000000000 -0600
+++ openslp-1.2.1/configure 2005-03-04 06:53:04.000000000 -0600
@@ -20596,7 +20596,7 @@
CFLAGS="$CFLAGS -Werror"
fi
if test X"$debug" = X"no"; then
- OPTFLAGS="-O3"
+ OPTFLAGS="-O3 $RPM_OPT_FLAGS"
fi
elif $CC -V 2>&1 | grep "WorkShop Compilers"; then
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:56:22 -0000 1.3
+++ .cvsignore 21 Oct 2005 18:56:57 -0000 1.4
@@ -1 +1 @@
-openslp-1.2.0.tar.gz
+openslp-1.2.1.tar.gz
Index: openslp.spec
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/openslp.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openslp.spec 23 May 2005 00:20:08 -0000 1.7
+++ openslp.spec 21 Oct 2005 18:56:57 -0000 1.8
@@ -1,25 +1,23 @@
# $Id$
-%define pie 1
-
Summary: Open implementation of Service Location Protocol V2
Name: openslp
-Version: 1.2.0
-Release: 6%{?dist_tag}
+Version: 1.2.1
+Release: 1%{?dist}
Group: System Environment/Libraries
License: BSD
-#URL: http://www.openslp.org/
URL: http://sourceforge.net/projects/openslp/
-Source: http://dl.sourceforge.net/sourceforge/openslp/openslp-1.2.0.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source: http://dl.sourceforge.net/sourceforge/openslp/openslp-1.2.1.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source1: slpd.init
-Patch1: openslp-1.2.0-optflags.patch
+Patch1: openslp-1.2.1-optflags.patch
-BuildRequires: autoconf automake libtool
-BuildRequires: bison flex
-#BuildRequires: byacc
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: bison
+BuildRequires: flex
BuildRequires: openssl-devel
%description
@@ -42,7 +40,7 @@
Summary: OpenSLP server daemon
Group: System Environment/Daemons
Requires: %{name} = %{version}-%{release}
-Requires(preun): chkconfig /sbin/service
+Requires(preun): chkconfig, /sbin/service
Requires(post): chkconfig
Requires(postun): /sbin/service
%description server
@@ -54,6 +52,7 @@
%patch1 -p1 -b .optflags
+# tarball goof (?), it wants to re-automake anyway, so let's do it right.
libtoolize --force
aclocal
autoconf
@@ -62,18 +61,15 @@
# remove CVS leftovers...
find . -name "CVS" | xargs rm -rf
-# remove hard-coded compiler flags: -O3 -Wall
-perl -pi -e "s at -O3@@g" configure
-#perl -pi -e "s at -Wall@@g" configure
-
%build
-%{?pie:export CFLAGS="-fPIC $RPM_OPT_FLAGS"; export LDFLAGS="-pie"}
+export LDFLAGS="-pie"
%configure \
- --disable-static
-# --enable-slpv2-security
+ --disable-dependency-tracking \
+ --disable-static \
+ --enable-slpv2-security
# --enable-async-api
make %{?_smp_mflags}
@@ -88,7 +84,7 @@
# nuke unpackaged/unwanted files
rm -rf $RPM_BUILD_ROOT/usr/doc
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%clean
@@ -96,19 +92,22 @@
%post -p /sbin/ldconfig
+
%postun -p /sbin/ldconfig
%post server
/sbin/chkconfig --add slpd
%preun server
+# on remove
if [ $1 -eq 0 ]; then
/sbin/service slpd stop >/dev/null 2>&1 ||:
/sbin/chkconfig --del slpd
fi
%postun server
-if [ $1 -ge 1 ]; then
+# on upgrade
+if [ $1 -gt 0 ]; then
/sbin/service slpd condrestart >/dev/null 2>&1
fi
@@ -116,15 +115,15 @@
%files
%defattr(-,root,root)
%doc AUTHORS COPYING FAQ NEWS README THANKS
-%doc doc/html/IntroductionToSLP
-%doc doc/html/UsersGuide
-%doc doc/html/faq*
%config(noreplace) %{_sysconfdir}/slp.conf
%{_bindir}/*
%{_libdir}/lib*.so.*
%files server
%defattr(-,root,root)
+%doc doc/html/IntroductionToSLP
+%doc doc/html/UsersGuide
+%doc doc/html/faq*
%{_sbindir}/*
%config(noreplace) %{_sysconfdir}/slp.reg
%config(noreplace) %{_sysconfdir}/slp.spi
@@ -139,6 +138,12 @@
%changelog
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.1-1
+- 1.2.1
+- move most docs to -server
+- --enable-slpv2-security
+- --disable-dependency-tracking
+
* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.0
- rebuild on all arches
Index: slpd.init
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/slpd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slpd.init 8 Nov 2004 04:56:22 -0000 1.1
+++ slpd.init 21 Oct 2005 18:56:57 -0000 1.2
@@ -249,7 +249,7 @@
fi
;;
*)
- echo "Usage: slpd {start|stop|restart|reload|status}"
+ echo "Usage: slpd {start|stop|restart|condrestart|reload|status}"
exit 1
esac
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openslp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:56:22 -0000 1.3
+++ sources 21 Oct 2005 18:56:57 -0000 1.4
@@ -1 +1 @@
-b101a73c11d759c6d7a48483f887fae7 openslp-1.2.0.tar.gz
+ff9999d1b44017281dd00ed2c4d32330 openslp-1.2.1.tar.gz
--- openslp-1.2.0-optflags.patch DELETED ---
More information about the fedora-extras-commits
mailing list