commit a24a503ecd70d0886b9034964c30d39e652887c7
Author: Jakub Bogusz <[email protected]>
Date: Sun Aug 30 10:52:51 2020 +0200
- adjusted pld patch to build with libtirpc+libnsl 1.x; release 3
pwdb-pld.patch | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
pwdb.spec | 9 ++++++---
2 files changed, 56 insertions(+), 4 deletions(-)
---
diff --git a/pwdb.spec b/pwdb.spec
index 579853b..88b4ca2 100644
--- a/pwdb.spec
+++ b/pwdb.spec
@@ -5,12 +5,15 @@ Summary(pl.UTF-8): Biblioteka danych o użytkownikach
Summary(tr.UTF-8): Parola veri tabanı arşivi
Name: pwdb
Version: 0.62
-Release: 2
+Release: 3
License: BSD or GPL
Group: Base
Source0:
http://pkgs.fedoraproject.org/repo/pkgs/compat-pwdb/pwdb-0.62.tar.gz/1a1fd0312040ef37aa741d09465774b4/%{name}-%{version}.tar.gz
# Source0-md5: 1a1fd0312040ef37aa741d09465774b4
Patch0: %{name}-pld.patch
+BuildRequires: libnsl-devel
+BuildRequires: libtirpc-devel
+BuildRequires: pkgconfig
BuildRequires: sgml-tools
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -80,7 +83,7 @@ ln -sf defs/pld.defs default.defs
%{__make} \
CC="%{__cc}" \
- OPTIMIZE="%{rpmcflags}"
+ OPTIMIZE="%{rpmcflags} $(pkg-config --cflags libtirpc libnsl)"
%{__make} -C doc
@@ -94,7 +97,7 @@ install -d
$RPM_BUILD_ROOT{%{_sysconfdir},/%{_lib},%{_includedir}/pwdb,%{_libdir
cp -p conf/pwdb.conf $RPM_BUILD_ROOT%{_sysconfdir}/pwdb.conf
-mv -f $RPM_BUILD_ROOT/%{_lib}/libpwdb.a $RPM_BUILD_ROOT%{_libdir}
+%{__mv} $RPM_BUILD_ROOT/%{_lib}/libpwdb.a $RPM_BUILD_ROOT%{_libdir}
%{__rm} $RPM_BUILD_ROOT/%{_lib}/libpwdb.so
ln -sf /%{_lib}/libpwdb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libpwdb.so
diff --git a/pwdb-pld.patch b/pwdb-pld.patch
index b4c5c24..e6c52dc 100644
--- a/pwdb-pld.patch
+++ b/pwdb-pld.patch
@@ -1,6 +1,6 @@
--- /dev/null Tue May 5 22:32:27 1998
+++ pwdb-0.55/defs/pld.defs Sat Jan 23 12:44:53 1999
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,23 @@
+#
+# Standard defines file for PLD Linux
+
@@ -23,3 +23,52 @@
+CONFIGED=$(PPFIX)/etc
+LIBDIR=$(PREFIX)/lib
+SECUREDIR=$(LIBDIR)/security
++NIS_LIBS=-lnsl -ltirpc
+--- pwdb-0.62/libpwdb/Makefile.orig 1999-04-10 11:31:20.000000000 +0200
++++ pwdb-0.62/libpwdb/Makefile 2020-08-30 10:45:36.598419348 +0200
+@@ -50,7 +50,7 @@
+
+
+ $(LIBDYNAME): $(LIBOBJ)
+- $(LD) -soname $(LIBSONAME) -x -shared -o $(LIBFILENAME) $(LIBOBJ)
-lcrypt -lnsl -lc
++ $(LD) -soname $(LIBSONAME) -x -shared -o $(LIBFILENAME) $(LIBOBJ)
$(NIS_LIBS) -lcrypt -lc
+ @ln -sf $(LIBFILENAME) $@
+
+ $(LIBSTATIC): $(LIBOBJ)
+--- pwdb-0.62/Makefile.orig 2002-02-01 02:58:29.000000000 +0100
++++ pwdb-0.62/Makefile 2020-08-30 10:50:57.880012149 +0200
+@@ -96,6 +96,7 @@
+ export AR # build a static library
+ export RANLIB # reorder a static library
+ export LOADLIBES # libraries needed for application linking
++export NIS_LIBS
+
+ #
+ # where to install things
+--- pwdb-0.62/examples/Makefile.orig 1998-10-07 01:57:04.000000000 +0200
++++ pwdb-0.62/examples/Makefile 2020-08-30 10:51:36.819801194 +0200
+@@ -15,19 +15,19 @@
+ all: ${PROGS} ../libpwdb/libpwdb.a
+
+ posix: posix.o ../libpwdb/libpwdb.a
+- $(CC) -o $@ $< ../libpwdb/libpwdb.a -lnsl
++ $(CC) -o $@ $< ../libpwdb/libpwdb.a $(NIS_LIBS)
+
+ tpwdb: tpwdb.o ../libpwdb/libpwdb.a
+- ${CC} -g -o $@ $< ../libpwdb/libpwdb.a -lnsl
++ ${CC} -g -o $@ $< ../libpwdb/libpwdb.a $(NIS_LIBS)
+
+ radtest: radtest.o ../libpwdb/libpwdb.a
+- ${CC} -g -o $@ $< ../libpwdb/libpwdb.a -lnsl
++ ${CC} -g -o $@ $< ../libpwdb/libpwdb.a $(NIS_LIBS)
+
+ gentest: gentest.o ../libpwdb/libpwdb.a
+- ${CC} -g -o $@ $< ../libpwdb/libpwdb.a -lnsl
++ ${CC} -g -o $@ $< ../libpwdb/libpwdb.a $(NIS_LIBS)
+
+ grouptest: grouptest.o ../libpwdb/libpwdb.a
+- ${CC} -g -o $@ $< ../libpwdb/libpwdb.a -lnsl
++ ${CC} -g -o $@ $< ../libpwdb/libpwdb.a $(NIS_LIBS)
+
+ clean:
+ rm -f ${PROGS} *.o *~
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pwdb.git/commitdiff/a24a503ecd70d0886b9034964c30d39e652887c7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
