@@ -1,7 +1,7 @@

 Summary:        Advanced Trivial File Transfer Protocol (ATFTP) - TFTP server

 Name:           atftp

 Version:        0.7.1

-Release:        3%{?dist}

+Release:        4%{?dist}

 URL:            http://sourceforge.net/projects/atftp

 License:        GPLv2+ and GPLv3+ and LGPLv2+

 Group:          System Environment/Daemons

@@ -84,25 +84,25 @@ ATFTPD_BIND_ADDRESSES=

 EOF

 %pre

-getent group  tftp  >/dev/null || groupadd -r tftp

-getent passwd tftp  >/dev/null || useradd  -c "tftp" -s /bin/false -g tftp -M -r tftp

-

+if [ $1 -eq 1 ] ; then

+    getent group  tftp  >/dev/null || groupadd -r tftp

+    getent passwd tftp  >/dev/null || useradd  -c "tftp" -s /bin/false -g tftp -M -r tftp

+fi

 %preun

-/bin/systemctl disable atftpd.socket

-

-

+%systemd_preun atftpd.socket

 %post

-/bin/systemctl enable atftpd.socket

-

+/sbin/ldconfig

+%systemd_post atftpd.socket

 %postun

 /sbin/ldconfig

-if getent passwd tftp >/dev/null; then

-    userdel tftp

+if [ $1 -eq 0 ] ; then

+    if getent passwd tftp >/dev/null; then

+        userdel tftp

+    fi

+    if getent group tftp >/dev/null; then

+        groupdel tftp

+    fi

 fi

-if getent group tftp >/dev/null; then

-    groupdel tftp

-fi

-

 %clean

 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != '/' ] && rm -rf $RPM_BUILD_ROOT

@@ -124,6 +124,8 @@ fi

 %changelog

+*   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.1-4

+-   Fixing spec file to handle rpm upgrade scenario correctly

 *   Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>  0.7.1-3

 -   Add systemd to Requires and BuildRequires.

 -   Use systemctl to enable/disable service.

@@ -1,7 +1,7 @@

 Summary:	Kernel Audit Tool

 Name:		audit

 Version:	2.5

-Release:	1%{?dist}

+Release:	2%{?dist}

 Source0:	http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz

 %define sha1 audit=b684a8dca31776a4184044733cd5fd4b1b652298

 License:	GPLv2+

@@ -68,13 +68,14 @@ make install DESTDIR=%{buildroot}

 %post

 /sbin/ldconfig

-/bin/systemctl enable  auditd.service

-

-%preun

-/bin/systemctl disable auditd.service

+%systemd_post  auditd.service

 %postun

 /sbin/ldconfig

+%systemd_postun auditd.service

+

+%preun

+%systemd_preun auditd.service

 %files 

 %defattr(-,root,root)

@@ -117,6 +118,8 @@ make install DESTDIR=%{buildroot}

 %{_includedir}/*.h

 %changelog

+* Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  2.5-2

+- Fixing spec file to handle rpm upgrade scenario correctly

 * Tue Feb 23 2016 Anish Swaminathan <anishs@vmware.com>  2.5-1

 - Upgrade to 2.5

 * Fri Jan 29 2016 Anish Swaminathan <anishs@vmware.com>  2.4.4-4

@@ -1,7 +1,7 @@

 Summary:	Bourne-Again SHell

 Name:		bash

 Version:	4.3.30

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPLv3

 URL:		http://www.gnu.org/software/bash/

 Group:		System Environment/Base

@@ -221,15 +221,17 @@ dircolors -p > %{buildroot}/etc/dircolors

 rm -rf %{buildroot}/%{_infodir}

 %post

-test -e /root/.bash_profile || cp /etc/skel/.bash_profile /root

-test -e /root/.bashrc || cp /etc/skel/.bashrc /root

-test -e /root/.bash_logout || cp /etc/skel/.bash_logout /root

-

+if [ $1 -eq 1 ] ; then

+    if [ ! -f "/root/.bash_logout" ] ; then

+        cp /etc/skel/.bash_logout /root/.bash_logout

+    fi

+fi

 %postun

-rm -f /root/.bashrc

-rm -f /root/.bash_profile

-rm -f /root/.bash_logout

-

+if [ $1 -eq 0 ] ; then

+    if [ -f "/root/.bash_logout" ] ; then

+        rm -f /root/.bash_logout

+    fi

+fi

 %files

 %defattr(-,root,root)

 /bin/*

@@ -242,13 +244,15 @@ rm -f /root/.bash_logout

 %defattr(-,root,root)

 %changelog

-*       Thu Mar 10 2016 Divya Thaluru <dthaluru@vmware.com> 4.3.30-2

--       Adding compile options to load bash.bashrc file and

-        loading source file during non-inetractive non-login shell

-*       Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 4.3.30-1

--       Updated to version 4.3.30

-*       Wed Aug 05 2015 Kumar Kaushik <kaushikk@vmware.com> 4.3-4

--       Adding post unstall section.

+*   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  4.3.30-3

+-   Fixing spec file to handle rpm upgrade scenario correctly

+*   Thu Mar 10 2016 Divya Thaluru <dthaluru@vmware.com> 4.3.30-2

+-   Adding compile options to load bash.bashrc file and

+    loading source file during non-inetractive non-login shell

+*   Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 4.3.30-1

+-   Updated to version 4.3.30

+*   Wed Aug 05 2015 Kumar Kaushik <kaushikk@vmware.com> 4.3-4

+-   Adding post unstall section.

 *	Wed Jul 22 2015 Alexey Makhalov <amakhalov@vmware.com> 4.3-3

 -	Fix segfault in save_bash_input.

 *	Tue Jun 30 2015 Alexey Makhalov <amakhalov@vmware.com> 4.3-2

@@ -1,6 +1,6 @@

 Name:           cloud-init

 Version:        0.7.6

-Release:        7%{?dist}

+Release:        8%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -60,30 +60,23 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg

 %clean

 rm -rf $RPM_BUILD_ROOT

-

 %post

-if [ $1 -eq 1 ] ; then

-    # Initial installation

-    # Enabled by default per "runs once then goes away" exception

-    /bin/systemctl enable cloud-config.service     >/dev/null 2>&1 || :

-    /bin/systemctl enable cloud-final.service      >/dev/null 2>&1 || :

-    /bin/systemctl enable cloud-init.service       >/dev/null 2>&1 || :

-    /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :

-fi

+%systemd_post cloud-config.service

+%systemd_post cloud-final.service

+%systemd_post cloud-init.service

+%systemd_post cloud-init-local.service

 %preun

-if [ $1 -eq 0 ] ; then

-    # Package removal, not upgrade

-    /bin/systemctl --no-reload disable cloud-config.service >/dev/null 2>&1 || :

-    /bin/systemctl --no-reload disable cloud-final.service  >/dev/null 2>&1 || :

-    /bin/systemctl --no-reload disable cloud-init.service   >/dev/null 2>&1 || :

-    /bin/systemctl --no-reload disable cloud-init-local.service >/dev/null 2>&1 || :

-    # One-shot services -> no need to stop

-fi

+%systemd_preun cloud-config.service

+%systemd_preun cloud-final.service

+%systemd_preun cloud-init.service

+%systemd_preun cloud-init-local.service

 %postun

-/bin/systemctl daemon-reload >/dev/null 2>&1 || :

-# One-shot services -> no need to restart

+%systemd_postun cloud-config.service

+%systemd_postun cloud-final.service

+%systemd_postun cloud-init.service

+%systemd_postun cloud-init-local.service

 %files

 %license LICENSE

@@ -97,6 +90,8 @@ fi

 %changelog

+*   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  0.7.6-8

+-   Clean up post, preun, postun sections in spec file.

 *   Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>

 -   Add systemd to Requires and BuildRequires.

 * Thu Sep 17 2015 Kumar Kaushik <kaushikk@vmware.com>

@@ -1,7 +1,7 @@

 Summary:	Cron Daemon

 Name:		cronie

 Version:	1.5.0

-Release:	7%{?dist}

+Release:	8%{?dist}

 License:	GPLv2+ and MIT and BSD and ISC

 URL:		https://fedorahosted.org/cronie

 Source0:	https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz

@@ -63,16 +63,20 @@ install -m 644 contrib/cronie.systemd %{buildroot}%{_libdir}/systemd/system/cron

 install -c -m755  %{SOURCE1} %{buildroot}/%{_bindir}/run-parts

 ln -sfv ./crond.service %{buildroot}/usr/lib/systemd/system/cron.service

+

 %check

 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

-%preun

-/bin/systemctl disable crond.service

 %post

 /sbin/ldconfig

-/bin/systemctl enable crond.service

+%systemd_post crond.service

-%postun	-p /sbin/ldconfig

+%postun

+/sbin/ldconfig

+%systemd_postun crond.service

+

+%preun

+%systemd_preun crond.service

 %files

 %defattr(-,root,root)

@@ -100,6 +104,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 /var/spool/anacron/cron.monthly

 /var/spool/anacron/cron.weekly

 %changelog

+*       Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  1.5.0-8

+-	Fixing spec file to handle rpm upgrade scenario correctly

 *   	Thu Mar 24 2016 Xiaolin Li <xiaolinl@vmware.com>  1.5.0-7

 -   	Add run-parts command.

 *   	Fri Mar 04 2016 Anish Swaminathan <anishs@vmware.com>  1.5.0-6

@@ -1,7 +1,7 @@

 Summary:	Cyrus Simple Authentication Service Layer (SASL) library

 Name:		cyrus-sasl

 Version:	2.1.26

-Release:	5%{?dist}

+Release:	6%{?dist}

 License:	Custom

 URL:		http://cyrusimap.web.cmu.edu/

 Group:		System Environment/Security

@@ -102,14 +102,14 @@ EOF

 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %post

 %{_sbindir}/ldconfig 

-if [ $1 -eq 1 ] ; then

-    # Initial installation

-    # Enabled by default per "runs once then goes away" exception

-    /bin/systemctl preset saslauthd.service  >/dev/null 2>&1 || :

-fi

-%postun	-p /sbin/ldconfig

+%systemd_post saslauthd.service

+

+%postun

+/sbin/ldconfig

+%systemd_postun saslauthd.service

+

 %preun

-/bin/systemctl disable saslauthd.service

+%systemd_preun saslauthd.service

 %clean

 rm -rf %{buildroot}/*

@@ -126,6 +126,8 @@ rm -rf %{buildroot}/*

 %{_datadir}/licenses/%{name}/LICENSE

 %{_mandir}/man8/saslauthd.8.gz

 %changelog

+*   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  2.1.26-6

+-   Fixing spec file to handle rpm upgrade scenario correctly

 *   Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com>  2.1.26-5

 -   Add systemd to Requires and BuildRequires.

 *   Wed Nov 11 2015 Xiaolin Li <xiaolinl@vmware.com> 2.1.26-4

@@ -1,7 +1,7 @@

 Summary:	Docbook-xml-4.5

 Name:		docbook-xml

 Version:	4.5

-Release:	4%{?dist}

+Release:	5%{?dist}

 License:	MIT

 URL:		http://www.docbook.org

 Source0:	http://www.docbook.org/xml/4.5/%{name}-%{version}.zip

@@ -126,14 +126,44 @@ do

     "file:///etc/xml/docbook" \

     /etc/xml/catalog

 done

-%postun

-rm /etc/xml/catalog

-rm /etc/xml/docbook

+

+%preun

+if [ $1 -eq 0 ] ; then

+    if [ -f /etc/xml/catalog ]; then

+        xmlcatalog --noout --del \

+        "file:///etc/xml/docbook" /etc/xml/catalog

+    fi

+    if [ -f /etc/xml/docbook ]; then

+        xmlcatalog --noout --del \

+        "file:///usr/share/xml/docbook/docbook-xml-4.5" /etc/xml/docbook

+        

+        for DTDVERSION in 4.1.2 4.2 4.3 4.4 %{version}

+        do

+            xmlcatalog --noout --del \

+            "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" /etc/xml/docbook

+        done

+

+        for file in `find /usr/share/xml/docbook/%{name}-%{version}/*.dtd -printf "%f\n"`

+        do

+            xmlcatalog --noout --del \

+            "file:///usr/share/xml/docbook/docbook-xml-4.5/$file" /etc/xml/docbook

+        done

+

+        for file in `find /usr/share/xml/docbook/%{name}-%{version}/*.mod -printf "%f\n"`

+        do

+            xmlcatalog --noout --del \

+            "file:///usr/share/xml/docbook/docbook-xml-4.5/$file" /etc/xml/docbook

+        done

+    fi

+fi

+

 %files

 %defattr(-,root,root)

 /usr/share/xml/docbook/%{name}-%{version}

 /etc/xml

 %changelog

+*   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  4.5-5

+-   Fixing spec file to handle rpm upgrade scenario correctly

 *   Thu Mar 10 2016 XIaolin Li <xiaolinl@vmware.com> 4.5.1-4

 -   Correct the local folder name.

 *   Mon Jul 6 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 4.5.1-3

@@ -1,7 +1,7 @@

 Summary:	Docbook-xsl-1.79.1

 Name:		docbook-xsl

 Version:	1.79.1

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	Apache License

 URL:		http://www.docbook.org

 Source0:	http://downloads.sourceforge.net/docbook/%{name}-%{version}.tar.bz2

@@ -65,14 +65,20 @@ xmlcatalog --noout --add "rewriteURI" \

            "/usr/share/xml/docbook/xsl-stylesheets-1.79.1" \

     /etc/xml/catalog

 %postun

-rm -rf /etc/xml/catalog

-

+if [ $1 -eq 0 ] ; then

+    if [ -f /etc/xml/catalog ]; then

+        xmlcatalog --noout --del \

+        "/usr/share/xml/docbook/xsl-stylesheets-1.79.1" /etc/xml/catalog

+    fi

+fi

 %files

 %defattr(-,root,root)

 /usr/share/xml/docbook/*

 %{_docdir}/*

 %changelog

+*       Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  1.79.1-2

+-	Fixing spec file to handle rpm upgrade scenario correctly

 *       Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 1.79.1-1

 -       Updated version.

 *       Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 1.78.1-2

@@ -1,7 +1,7 @@

 Summary:    	Docker

 Name:       	docker

 Version:    	1.11.0

-Release:    	2%{?dist}

+Release:    	3%{?dist}

 License:    	ASL 2.0

 URL:        	http://docs.docker.com

 Group:      	Applications/File

@@ -30,13 +30,13 @@ cp %{SOURCE2} %{buildroot}/lib/systemd/system/docker-containerd.service

 %check

 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %preun

-/bin/systemctl disable docker.service

-/bin/systemctl disable docker-containerd.service

+%systemd_preun docker.service

+%systemd_preun docker-containerd.service

 %post

 /sbin/ldconfig

-#/bin/systemctl enable docker-containerd.service

-#/bin/systemctl enable docker.service

+#%systemd_post docker-containerd.service

+#%systemd_post docker.service

 %postun	-p /sbin/ldconfig

@@ -50,6 +50,8 @@ rm -rf %{buildroot}/*

 /lib/systemd/system/docker-containerd.service

 %changelog

+*   Tue May 3 2016 Divya Thaluru <dthaluru@vmware.com>  1.11.0-3

+-   Fixing spec file to handle rpm upgrade scenario correctly

 *   Sat Apr 30 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.11.0-2

 -   Add $DOCKER_OPTS to start in docker.service

 *   Fri Apr 15 2016 Anish Swaminathan <anishs@vmware.com> 1.11.0-1

@@ -1,7 +1,7 @@

 Summary:	Highly reliable distributed coordination

 Name:		zookeeper

 Version:	3.4.8

-Release:	2%{?dist}

+Release:	3%{?dist}

 URL:		http://zookeeper.apache.org/

 License:	Apache License, Version 2.0

 Group:		Applications/System

@@ -59,21 +59,22 @@ getent group hadoop >/dev/null || /usr/sbin/groupadd -r hadoop

 getent passwd zookeeper >/dev/null || /usr/sbin/useradd --comment "ZooKeeper" --shell /bin/bash -M -r --groups hadoop --home %{_prefix}/share/zookeeper zookeeper

 %post

-source %{_sysconfdir}/profile.d/java-exports.sh

-bash %{_prefix}/sbin/update-zookeeper-env.sh \

+if [ $1 -eq 1 ] ; then

+    # Initial installation

+    # Enabled by default per "runs once then goes away" exception

+    source %{_sysconfdir}/profile.d/java-exports.sh

+    bash %{_prefix}/sbin/update-zookeeper-env.sh \

        --prefix=%{_prefix} \

        --conf-dir=%{_sysconfdir}/zookeeper \

        --log-dir=%{_var}/log/zookeeper \

        --pid-dir=%{_var}/run/zookeeper \

        --var-dir=%{_var}/zookeeper

-%{_sbindir}/ldconfig 

-if [ $1 -eq 1 ] ; then

-    # Initial installation

-    # Enabled by default per "runs once then goes away" exception

-    /bin/systemctl enable zookeeper.service || :

 fi

-

+%{_sbindir}/ldconfig

+%systemd_post zookeeper.service

+ 

 %preun

+if [ $1 -eq 0 ] ; then

 source %{_sysconfdir}/profile.d/java-exports.sh

 bash %{_prefix}/sbin/update-zookeeper-env.sh \

        --prefix=%{_prefix} \

@@ -82,10 +83,15 @@ bash %{_prefix}/sbin/update-zookeeper-env.sh \

        --pid-dir=%{_var}/run/zookeeper \

        --var-dir=%{_var}/zookeeper \

        --uninstall

-/bin/systemctl disable zookeeper.service

+fi

+%systemd_preun zookeeper.service

 %postun

-/usr/sbin/userdel zookeeper

+%systemd_postun zookeeper.service

+if [ $1 -eq 0 ] ; then

+    /usr/sbin/userdel zookeeper

+    /usr/sbin/groupdel hadoop

+fi

 /sbin/ldconfig

 %files

@@ -98,6 +104,8 @@ bash %{_prefix}/sbin/update-zookeeper-env.sh \

 %{_prefix}

 %changelog

+*   Mon May 2 2016 Divya Thaluru <dthaluru@vmware.com>  3.4.8-3

+-   Fixing spec file to handle rpm upgrade scenario correctly

 *   Thu Apr 28 2016 Divya Thaluru <dthaluru@vmware.com>  3.4.8-2

 -   Added logic to set classpath

 *   Wed Feb 24 2016 Kumar Kaushik <kaushikk@vmware.com>  3.4.8-1