[jabberd/el5/master: 32/32] - new upstream release jabberd 2.2.11 - fix script-without-shebang errors - preserve timestamp of Ch
Dominic Hopf
dmaphy at fedoraproject.org
Wed Oct 6 23:24:57 UTC 2010
commit 75fceb0ffc9fa1626a38e6d4ee70e6762210efc7
Merge: 032283d 7d59c95
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date: Thu Oct 7 01:24:56 2010 +0200
- new upstream release jabberd 2.2.11
- fix script-without-shebang errors
- preserve timestamp of ChangeLog while converting to UTF8
- add patch jabberd-fix-missing-reference-in-log_error.patch from upstream svn
- use %{_mandir} macro for manpages
- create a new source file for the PAM info instead of writing it on the fly
- install all tools provided by upstream to /usr/share/jabberd/
- remove storage driver replacement, since 2.2.10 sqlite is the default
- remove dependency to gc-devel
- remove unneccessary defines for sysconfdir and don't use unneccessary macros
- remove static libraries
- fix a lot of rpmlint errors and warnings
- rename file jabberd to jabberd.init to make 'fedpkg mockbuild' possible
.gitignore | 1 +
jabberd => jabberd.init | 0
jabberd.pam | 5 +
jabberd.spec | 280 ++++++++++++++++++++++++++---------------------
4 files changed, 160 insertions(+), 126 deletions(-)
---
diff --cc .gitignore
index 392558c,f0988ca..b47ab65
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,2 @@@
jabberd-2.2.8.tar.bz2
-/jabberd-2.2.11.tar.bz2
++jabberd-2.2.11.tar.bz2
diff --cc jabberd.spec
index 8180af7,b587c78..1a63954
--- a/jabberd.spec
+++ b/jabberd.spec
@@@ -39,73 -39,75 +39,74 @@@ This packages defaults to use pam and s
%prep
%setup -q
- %patch0 -p1
%build
- %define _sysconfdir /etc/jabberd
- %define sysconfdir /etc/jabberd
- %{__sed} -i -e "s,sysconfdir=\"\$sysconfdir\/jabberd\",#&,g" configure
-
- # GC plug (see http://jabberd2.xiaoka.com/wiki/Hints)
- export LIBS='-lgc'
-
+ export CFLAGS="%{optflags}"
%configure \
- %{!?_without_pam:--enable-pam} \
- %{?_without_pam:--disable-pam} \
- %{!?_without_db4:--enable-db} \
- %{?_without_db4:--disable-db} \
- %{!?_without_mysql:--enable-mysql} \
- %{!?_without_mysql:--with-extra-library-path=%{_libdir}/mysql} \
- %{?_without_mysql:--disable-mysql} \
- %{!?_without_ldap:--enable-ldap} \
- %{?_without_ldap:--disable-ldap} \
- %{!?_without_postgresql:--enable-pgsql} \
- %{?_without_postgresql:--disable-pgsql} \
- %{!?_without_sqlite:--enable-sqlite} \
- %{?_without_sqlite:--disable-sqlite} \
- --localstatedir=%{_var}/lib \
- --enable-fs --enable-anon --enable-pipe --enable-ssl \
- --enable-debug
-
- %{__make} %{?_smp_mflags}
+ --sysconfdir=%{_sysconfdir}/%{name} \
+ --localstatedir=%{_var}/lib \
+ %{!?_without_pam:--enable-pam} \
+ %{?_without_pam:--disable-pam} \
+ %{!?_without_db4:--enable-db} \
+ %{?_without_db4:--disable-db} \
+ %{!?_without_mysql:--enable-mysql} \
+ %{!?_without_mysql:--with-extra-library-path=%{_libdir}/mysql} \
+ %{?_without_mysql:--disable-mysql} \
+ %{!?_without_ldap:--enable-ldap} \
+ %{?_without_ldap:--disable-ldap} \
+ %{!?_without_postgresql:--enable-pgsql} \
+ %{?_without_postgresql:--disable-pgsql} \
+ %{!?_without_sqlite:--enable-sqlite} \
+ %{?_without_sqlite:--disable-sqlite} \
+ --enable-fs --enable-anon --enable-pipe --enable-ssl \
+ --enable-debug \
+
+ make %{?_smp_mflags}
-
%install
- %{__rm} -rf $RPM_BUILD_ROOT
- %makeinstall
- %define _sysconfdir /etc
- %{__mkdir_p} $RPM_BUILD_ROOT/%{_var}/lib/jabberd/{log,pid,db}
- %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/%{name}
- %{__mkdir_p} $RPM_BUILD_ROOT%{_initrddir}
- %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
- %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
- %{__install} -p -m 644 tools/db-setup.mysql $RPM_BUILD_ROOT%{_datadir}/%{name}
- %{__install} -p -m 644 tools/db-setup.pgsql $RPM_BUILD_ROOT%{_datadir}/%{name}
- %{__install} -p -m 644 tools/migrate.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
- %{__install} -p -m 644 tools/pipe-auth.pl $RPM_BUILD_ROOT%{_datadir}/%{name}
- %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
- %{__install} -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-
- %{__sed} -i -e "s,__BINDIR__,%{_bindir},g" \
- -e "s,__ETCDIR__,%{sysconfdir},g" \
- -e "s,__PIDDIR__,%{_var}/lib/jabberd/pid,g" \
- -e "s,__SYSCONF__,%{_sysconfdir}/sysconfig,g" \
- $RPM_BUILD_ROOT%{_initrddir}/%{name} \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-
- %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/jabberd << END
- #%PAM-1.0
- auth required pam_nologin.so
- auth include system-auth
- account include system-auth
- session include system-auth
- END
-
- #default driver for storage
- #the default pam backend needs auto creation of accounts
- %{__sed} -i -e ':a;N;$!ba' \
- -e 's,<driver>mysql</driver>,<driver>db</driver>,g' \
- -e 's,<!--\n <auto-create/>\n -->,<auto-create/>,g' \
- $RPM_BUILD_ROOT%{sysconfdir}/sm.xml
+ rm -rf $RPM_BUILD_ROOT
+
+ make install DESTDIR=$RPM_BUILD_ROOT
+
+ # correct the script interpreter for perl scripts
+ sed -i "s|/usr/pkg/bin/perl|/usr/bin/env perl|" tools/*.pl
+
+ # convert ChangeLog to UTF-8, but keep the timestamp
+ iconv -f ISO88591 -t UTF8 < ChangeLog > ChangeLog.utf8 && \
+ touch -r ChangeLog ChangeLog.utf8 && \
+ mv ChangeLog.utf8 ChangeLog
+
+ install -dpm 644 $RPM_BUILD_ROOT/%{_var}/lib/%{name}/{log,pid,db}
+ install -dpm 755 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
+ install -Dpm 644 tools/pam_jabberd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name}
+
+ install -dpm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/
+ # install any tool in tools/ to /usr/share/jabberd/, but skip Makefile-stuff
+ # and unneccessary scripts
+ install -dpm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/
+ for i in `ls tools`; do
+ if [ $i == "Makefile" -o $i == "Makefile.am" -o $i == "Makefile.in" \
+ -o $i == "jabberd.in" -o $i == "jabberd.rc" -o $i == "pam_jabberd" ]; then
+ continue;
+ fi
+
+ sed -i "s|\r||g" tools/$i
+ install -pm 755 tools/$i $RPM_BUILD_ROOT%{_datadir}/%{name}/
+ done
+
+ install -dpm 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
+ install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+ install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+
+ sed -i -e "s,__BINDIR__,%{_bindir},g" \
+ -e "s,__ETCDIR__,%{_sysconfdir}/%{name}/,g" \
+ -e "s,__PIDDIR__,%{_var}/lib/%{name}/pid,g" \
+ -e "s,__SYSCONF__,%{_sysconfdir}/sysconfig,g" \
+ $RPM_BUILD_ROOT%{_initrddir}/%{name} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+
+ # remove static libraries
+ find $RPM_BUILD_ROOT -name "*.la" -delete
#default authentication backend
#enable SSL certificate
@@@ -175,23 -173,54 +172,54 @@@ if [ "$1" -eq "1" ]; the
fi
%files
- %defattr(-,root,root)
- %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+ %defattr(-,root,root,-)
+ %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO UPGRADE
+ %{_mandir}/man8/*
%{_bindir}/*
%{_libdir}/%{name}/
- %attr(750, jabber, jabber) %dir %{sysconfdir}/
- %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*xml*
- %attr(750, jabber, jabber) %dir %{sysconfdir}/templates
- %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/templates/*xml*
- %{_datadir}/man/man8/*
- %{_datadir}/%{name}/
+ %attr(750, jabber, jabber) %dir %{_sysconfdir}/%{name}
+ %attr(750, jabber, jabber) %dir %{_sysconfdir}/%{name}/templates
+ %attr(640, jabber, jabber) %config(noreplace) %{_sysconfdir}/%{name}/*xml*
+ %attr(640, jabber, jabber) %config(noreplace) %{_sysconfdir}/%{name}/templates/*xml*
+ %dir %{_datadir}/%{name}/
+ %attr(644,root,root) %{_datadir}/%{name}/*
+ %attr(755,root,root) %{_datadir}/%{name}/*.pl
+ %attr(755,root,root) %{_datadir}/%{name}/*.rb
+ %attr(755,root,root) %{_datadir}/%{name}/%{name}
%{_initrddir}/%{name}
- %config(noreplace) %{_sysconfdir}/pam.d/jabberd
- %config %{_sysconfdir}/sysconfig/jabberd
- %attr(-, jabber, jabber) %{_var}/lib/jabberd
- %ghost %{_sysconfdir}/jabberd/server.pem
+ %config(noreplace) %{_sysconfdir}/pam.d/%{name}
+ %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+ %attr(755, jabber, jabber) %{_var}/lib/%{name}
+ %attr(640, jabber, jabber) %ghost %{_sysconfdir}/%{name}/server.pem
%changelog
+ * Wed Oct 06 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-2
+ - new upstream release jabberd 2.2.11
+ - fix script-without-shebang errors
+ - preserve timestamp of ChangeLog while converting to UTF8
+ - add patch jabberd-fix-missing-reference-in-log_error.patch from upstream svn
+ - use %%{_mandir} macro for manpages
+ - create a new source file for the PAM info instead of writing it on the fly
+ - install all tools provided by upstream to /usr/share/jabberd/
+ - remove storage driver replacement, since 2.2.10 sqlite is the default
+ - remove dependency to gc-devel
+ - remove unneccessary defines for sysconfdir and don't use unneccessary macros
+ - remove static libraries
+ - fix a lot of rpmlint errors and warnings
-- rename file jabberd to jabberd.init to make 'fedpkg mockbuild' possible
++- rename file jabberd to jabberd.init to make 'fedpkg mockbuild' possible
+
+ * Wed Sep 29 2010 jkeating - 2.2.8-5.1
+ - Rebuilt for gcc bug 634757
+
+ * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-5
+ - use password-auth common PAM configuration instead of system-auth
+
+ * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-4
+ - rebuilt with new openssl
+
+ * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.8-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Fri Jun 19 2009 Adrian Reber <adrian at lisas.de> - 2.2.8-2
- updated to 2.2.8
- added patch to fix "router segfaults" (rhbz#497671)
More information about the scm-commits
mailing list