Author: wiget Date: Sun Apr 10 20:47:06 2011 GMT Module: packages Tag: HEAD ---- Log message: - fix pkgconfig file (ssl.patch) - drop libtool file - rel. 2
---- Files affected: packages/nut: nut.spec (1.165 -> 1.166) , ssl.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/nut/nut.spec diff -u packages/nut/nut.spec:1.165 packages/nut/nut.spec:1.166 --- packages/nut/nut.spec:1.165 Wed Feb 16 19:30:03 2011 +++ packages/nut/nut.spec Sun Apr 10 22:47:01 2011 @@ -14,7 +14,7 @@ Summary(pl.UTF-8): Sieciowe narzędzie do UPS-ów Name: nut Version: 2.6.0 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source0: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz @@ -28,6 +28,7 @@ Patch2: %{name}-smartdp-load.patch Patch3: %{name}-upssched-cmd-sysconf.patch Patch4: %{name}-matrix.patch +Patch5: ssl.patch URL: http://www.networkupstools.org/ BuildRequires: autoconf BuildRequires: automake @@ -191,6 +192,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build cp -f /usr/share/automake/config.sub . @@ -244,6 +246,8 @@ /etc/rc.d/init.d/ups powerdown EOF +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la + %clean rm -rf $RPM_BUILD_ROOT @@ -452,9 +456,8 @@ %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libupsclient.la %attr(755,root,root) %{_libdir}/libupsclient.so -%{_pkgconfigdir}/* +%{_pkgconfigdir}/libupsclient.pc %{_includedir}/*.h %{_mandir}/man3/*.3* @@ -464,6 +467,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.166 2011/04/10 20:47:01 wiget +- fix pkgconfig file (ssl.patch) +- drop libtool file +- rel. 2 + Revision 1.165 2011/02/16 18:30:03 sls - blazer-parse.patch and hal-paths.patch no longer needed in 2.6.0 - rel. 1 ================================================================ Index: packages/nut/ssl.patch diff -u /dev/null packages/nut/ssl.patch:1.1 --- /dev/null Sun Apr 10 22:47:06 2011 +++ packages/nut/ssl.patch Sun Apr 10 22:47:01 2011 @@ -0,0 +1,9 @@ +--- nut-2.6.0/lib/libupsclient.pc.in.wiget 2011-04-10 22:40:52.640610125 +0200 ++++ nut-2.6.0/lib/libupsclient.pc.in 2011-04-10 22:41:02.441650442 +0200 +@@ -9,5 +9,5 @@ nutuser=@RUN_AS_USER@ + Name: libupsclient + Description: UPS monitoring with Network UPS Tools + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@ ++Libs: -L${libdir} -lupsclient @LIBSSL_LIBS@ + Cflags: -I${includedir} @LIBSSL_CFLAGS@ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut.spec?r1=1.165&r2=1.166&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
