[Fedora-directory-commits] coolkey Makefile.in, 1.2, 1.3 config.status, 1.2, 1.3 configure, 1.2, 1.3 configure.in, 1.2, 1.3 coolkey.spec, 1.2, 1.3

[Doctor Conrad]

Author: rrelyea

Update of /cvs/dirsec/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19078

Modified Files:
    Makefile.in config.status configure configure.in coolkey.spec 
Log Message:

Package review changes: make libckyapplet a shared library.

Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in	9 Jun 2006 21:56:34 -0000	1.2
+++ Makefile.in	10 Jun 2006 00:51:08 -0000	1.3
@@ -410,6 +410,7 @@
 distdir: $(DISTFILES)
    $(am__remove_distdir)
    mkdir $(distdir)
+	$(mkdir_p) $(distdir)/src/libckyapplet
    @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    list='$(DISTFILES)'; for file in $$list; do \

Index: config.status
===================================================================
RCS file: /cvs/dirsec/coolkey/config.status,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.status	9 Jun 2006 21:56:34 -0000	1.2
+++ config.status	10 Jun 2006 00:51:08 -0000	1.3
@@ -271,7 +271,7 @@
 _CSEOF
 echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
 echo >&5
-config_files=" Makefile src/libckyapplet/Makefile src/coolkey/Makefile"
+config_files=" Makefile src/libckyapplet/Makefile src/libckyapplet/libckyapplet.pc src/coolkey/Makefile"
 config_headers=" config.h"
 config_commands=" depfiles"

@@ -399,6 +399,7 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/libckyapplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/Makefile" ;;
+  "src/libckyapplet/libckyapplet.pc" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/libckyapplet.pc" ;;
   "src/coolkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/coolkey/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

Index: configure
===================================================================
RCS file: /cvs/dirsec/coolkey/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure	9 Jun 2006 21:56:34 -0000	1.2
+++ configure	10 Jun 2006 00:51:08 -0000	1.3
@@ -20996,7 +20996,7 @@

-                              ac_config_files="$ac_config_files Makefile src/libckyapplet/Makefile src/coolkey/Makefile"
+                                        ac_config_files="$ac_config_files Makefile src/libckyapplet/Makefile src/libckyapplet/libckyapplet.pc src/coolkey/Makefile"

cat >confcache <<_ACEOF
 # This file is a shell script that caches the results of configure
@@ -21570,6 +21570,7 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "src/libckyapplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/Makefile" ;;
+  "src/libckyapplet/libckyapplet.pc" ) CONFIG_FILES="$CONFIG_FILES src/libckyapplet/libckyapplet.pc" ;;
   "src/coolkey/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/coolkey/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.in	9 Jun 2006 21:56:34 -0000	1.2
+++ configure.in	10 Jun 2006 00:51:08 -0000	1.3
@@ -191,6 +191,7 @@
 AC_CONFIG_FILES([ 
 Makefile
 src/libckyapplet/Makefile
+src/libckyapplet/libckyapplet.pc
 src/coolkey/Makefile
 ])
 AC_OUTPUT

Index: coolkey.spec
===================================================================
RCS file: /cvs/dirsec/coolkey/coolkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coolkey.spec	9 Jun 2006 21:56:34 -0000	1.2
+++ coolkey.spec	10 Jun 2006 00:51:08 -0000	1.3
@@ -48,7 +48,7 @@

%build
 %configure --disable-dependency-tracking 
-make %(?_smp_mflags)
+make %{?_smp_mflags}

%install
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +56,8 @@
 ln -s pkcs11/libcoolkeypk11.so $RPM_BUILD_ROOT/%{_libdir}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/pkcs11/libcoolkeypk11.a
-install -m 755 clib/.libs/libckyapplet.a $RPM_BUILD_ROOT/%{_libdir}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libckyapplet.la

%clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,9 +67,12 @@
 %doc ChangeLog LICENSE 
 %{_libdir}/libcoolkeypk11.so
 %{_libdir}/pkcs11/libcoolkeypk11.so
+%{_libdir}/libckyapplet.so.1
+%{_libdir}/libckyapplet.so.1.0.0

%files devel
-%{_libdir}/libckyapplet.a
+%{_libdir}/libckyapplet.so
+%{_libdir}/pkgconfig/libckyapplet.pc
 %{_includedir}/*.h