rpms/uw-imap/devel .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 uw-imap.spec, 1.15, 1.16

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/uw-imap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2028

Modified Files:
	.cvsignore sources uw-imap.spec 
Log Message:
* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-1
- imap-2006a
- omit static lib (for now, at least)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Sep 2006 15:49:38 -0000	1.3
+++ .cvsignore	26 Sep 2006 20:29:56 -0000	1.4
@@ -1 +1,2 @@
 imap-2006.tar.Z
+imap-2006a.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Sep 2006 15:49:38 -0000	1.4
+++ sources	26 Sep 2006 20:29:56 -0000	1.5
@@ -1 +1 @@
-ab38578a0b00cbed6c3957898d70f76b  imap-2006.tar.Z
+70b98056744f44aa52ccf4f668872b8e  imap-2006a.tar.Z


Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- uw-imap.spec	25 Sep 2006 18:43:03 -0000	1.15
+++ uw-imap.spec	26 Sep 2006 20:29:56 -0000	1.16
@@ -5,8 +5,8 @@
 
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
-Version: 2006
-Release: 4%{?dist}
+Version: 2006a
+Release: 1%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: Apache 2.0 
@@ -17,7 +17,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define soname    c-client
-%define somajor  %{version} 
+#define somajor   %{version} 
+%define somajor   2006
 %define shlibname lib%{soname}.so.%{somajor}
 %define imap_libs lib%{soname}%{somajor}
 #Old naming
@@ -79,15 +80,15 @@
 Obsoletes: imap-devel < 1:%{version}
 Conflicts: libc-client-devel
 %description devel
-Contains the header files and static libraries for developing programs 
+Contains the header files and libraries for developing programs 
 which will use the UW C-client common API.
 
-%package devel-static 
+%package static 
 Summary: UW IMAP static library
 Group:   Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: krb5-devel openssl-devel pam-devel
-%description devel-static 
+%description static 
 Contains static libraries for developing programs
 which will use the UW C-client common API.
 
@@ -198,7 +199,11 @@
 EOF
 install -p -m644 -D c-client.cf $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
 
+# include/omit static lib?
+%{!?_with_static:rm -f $RPM_BUILD_ROOT%{_libdir}/*.a }
 
+
+# FIXME, do this on daemon startup -- Rex
 %post
 {
 cd %{sslcerts} &> /dev/null || :
@@ -268,7 +273,7 @@
 %attr(2755, root, mail) %{_sbindir}/mlock
 %{_mandir}/man1/*
 
-%files -n lib%{soname}%{version}
+%files -n %{imap_libs} 
 %defattr(-,root,root)
 %doc LICENSE.txt NOTICE SUPPORT 
 %doc docs/RELNOTES docs/*.txt
@@ -279,13 +284,19 @@
 %{_includedir}/imap/
 %{_libdir}/lib%{soname}.so
 
-%files devel-static
+%if "%{?_with_static:1}" == "1"
+%files static
 %defattr(-,root,root,-)
 %{_libdir}/c-client.a
 %{_libdir}/libc-client.a
+%endif
 
 
 %changelog
+* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006a-1
+- imap-2006a
+- omit static lib (for now, at least)
+
 * Mon Sep 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2006-4
 - -devel-static: package static lib separately.