rpms/uw-imap/EL-4 .cvsignore, 1.7, 1.8 sources, 1.8, 1.9 uw-imap.spec, 1.22, 1.23
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Apr 3 16:44:05 UTC 2007
Author: rdieter
Update of /cvs/extras/rpms/uw-imap/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12381
Modified Files:
.cvsignore sources uw-imap.spec
Log Message:
* Mon Apr 2 2007 Joe Orton <jorton at redhat.com> 2006g-2
- use $RPM_OPT_FLAGS during build
* Mon Apr 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006g-1
- imap-2006g
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/EL-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 27 Jan 2007 03:57:15 -0000 1.7
+++ .cvsignore 3 Apr 2007 16:43:32 -0000 1.8
@@ -1,6 +1 @@
-imap-2006.tar.Z
-imap-2006a.tar.Z
-imap-2006b.tar.Z
-imap-2006c1.tar.Z
-imap-2006d.tar.Z
-imap-2006e.tar.Z
+imap-2006g.tar.Z
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 27 Jan 2007 03:57:15 -0000 1.8
+++ sources 3 Apr 2007 16:43:32 -0000 1.9
@@ -1 +1 @@
-a183c975a00198b0f5668ae311254aca imap-2006e.tar.Z
+675dc805e9c5bd77c07f5554f29a24ec imap-2006g.tar.Z
Index: uw-imap.spec
===================================================================
RCS file: /cvs/extras/rpms/uw-imap/EL-4/uw-imap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- uw-imap.spec 27 Jan 2007 03:57:15 -0000 1.22
+++ uw-imap.spec 3 Apr 2007 16:43:32 -0000 1.23
@@ -1,10 +1,12 @@
+# Fedora review: http://bugzilla.redhat.com/166008
+
#define snap 0701181849
#define beta .DEV.SNAP-%{snap}
Summary: UW Server daemons for IMAP and POP network mail protocols
Name: uw-imap
-Version: 2006e
+Version: 2006g
Release: 2%{?dist}
# See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
@@ -20,7 +22,8 @@
%define somajor 2006
%define shlibname lib%{soname}.so.%{somajor}
%define imap_libs lib%{soname}%{somajor}
-#Old naming
+## Old naming
+#define imap_libs lib%{soname}
#define imap_libs imap-libs
# FC4+ uses %%_sysconfdir/pki/tls/certs, previous releases used %%_datadir/ssl/certs
@@ -29,8 +32,6 @@
# imap -> uw-imap rename
Obsoletes: imap < 1:%{version}
-Source10: c-client.cf
-
# new pam setup, using new "include" feature
Source21: imap.pam
# legacy/old pam setup, using pam_stack.so
@@ -68,6 +69,7 @@
Group: System Environment/Libraries
Obsoletes: libc-client2004d < 1:2004d-2
Obsoletes: libc-client2004e < 2004e-2
+Obsoletes: libc-client2004g < 2004g-7
%description -n %{imap_libs}
Provides a common API for accessing mailboxes.
@@ -125,9 +127,12 @@
test -f %{_sysconfdir}/profile.d/krb5.sh && source %{_sysconfdir}/profile.d/krb5.sh
GSSDIR=$(krb5-config --prefix)
-## SSL setup
-# probably legacy-only, but shouldn't hurt -- Rex
+# SSL setup, probably legacy-only, but shouldn't hurt -- Rex
export EXTRACFLAGS="$EXTRACFLAGS $(pkg-config --cflags openssl 2>/dev/null)"
+# $RPM_OPT_FLAGS
+export EXTRACFLAGS="$EXTRACFLAGS $RPM_OPT_FLAGS"
+# jorton added these, I'll assume he knows what he's doing. :) -- Rex
+export EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing -Wno-pointer-sign"
echo "y" | \
make %{?_smp_mflags} lnp \
@@ -156,10 +161,10 @@
ln -s %{shlibname} $RPM_BUILD_ROOT%{_libdir}/lib%{soname}.so
mkdir -p $RPM_BUILD_ROOT%{_includedir}/imap/
-install -m644 ./c-client/*.h $RPM_BUILD_ROOT%{_includedir}/imap
+install -m644 ./c-client/*.h $RPM_BUILD_ROOT%{_includedir}/imap/
# Added linkage.c to fix (#34658) <mharris>
-install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap
-install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap
+install -m644 ./c-client/linkage.c $RPM_BUILD_ROOT%{_includedir}/imap/
+install -m644 ./src/osdep/tops-20/shortsym.h $RPM_BUILD_ROOT%{_includedir}/imap/
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8/
install -p -m644 src/{ipopd/ipopd,imapd/imapd}.8 $RPM_BUILD_ROOT%{_mandir}/man8/
@@ -182,11 +187,12 @@
install -p -m644 -D %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/ipop3
install -p -m644 -D %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/pop3s
-# %ghost *.pem files
+## %ghost'd items
+# *.pem files
mkdir -p $RPM_BUILD_ROOT%{sslcerts}/
touch $RPM_BUILD_ROOT%{sslcerts}/{imapd,ipop3d}.pem
-
-install -p -m644 -D %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
+# c-client.cf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/c-client.cf
# FIXME, do this on daemon startup -- Rex
@@ -271,6 +277,16 @@
%changelog
+* Mon Apr 2 2007 Joe Orton <jorton at redhat.com> 2006g-2
+- use $RPM_OPT_FLAGS during build
+
+* Mon Apr 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006g-1
+- imap-2006g
+
+* Wed Feb 07 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006e-3
+- Obsoletes: libc-client2004g
+- cleanup/simplify c-client.cf handling
+
* Fri Jan 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2006e-2
- use /etc/profile.d/krb5-devel.sh
More information about the fedora-extras-commits
mailing list