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

 Summary:	Mercurial-3.1.2

 Name:		mercurial

 Version:	3.7.1

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GPLv2+

 URL:		https://www.ruby-lang.org/en/

 Group:		System Environment/Security

@@ -41,14 +41,18 @@ export PYTHONPATH="$PYTHONPATH:/var/opt/%{name}-%{version}/mercurial/pure"

 EOF

 %{_fixperms} %{buildroot}/*

+

 %check

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

+

 %post -p /sbin/ldconfig

+

 %postun

 /sbin/ldconfig

-rm /etc/profile.d/java-exports.sh

+

 %clean

 rm -rf %{buildroot}/*

+

 %files

 %defattr(-,root,root)

 /.hgrc

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

 %exclude /var/opt/%{name}-%{version}/contrib/plan9

 %exclude /var/opt/%{name}-%{version}/build/temp.*

 %changelog

+*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 3.7.1-2

+-	Edit postun script.

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

 -       Updating Version.

 *	Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 3.1.2-4

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

 Summary:	Network Time Protocol reference implementation

 Name:		ntp

 Version:	4.2.8p6

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	NTP

 URL:		http://www.ntp.org/

 Group:		System Environment/NetworkingPrograms

@@ -101,14 +101,13 @@ if ! getent passwd ntp >/dev/null; then

 fi

 %post

 %{_sbindir}/ldconfig 

-if [ $1 -eq 1 ] ; then

-    # Initial installation

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

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

-fi

+%systemd_post ntpd.service

 %preun

-/bin/systemctl disable ntpd.service

+%systemd_preun ntpd.service

+

+%postun

+%systemd_postun_with_restart ntpd.service

 %clean

 rm -rf %{buildroot}/*

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

 %{_mandir}/man8/ntpstat.8*

 %changelog

+*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 4.2.8p6-2

+-	Edit scriptlets.

 *	Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 4.2.8p6-1

 -	Upgrade version

 *   	Thu Jan 7 2016 Xiaolin Li <xiaolinl@vmware.com>  4.2.8p3-4

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

 Summary:        Usermode tools for VmWare virts

 Name:           open-vm-tools

 Version:        10.0.5

-Release:        8%{?dist}

+Release:        9%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/vmware/open-vm-tools

 Group:          Applications/System

@@ -65,12 +65,10 @@ mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}

 %post

 /sbin/ldconfig

-%systemd_post vgauthd.service

-%systemd_post vmtoolsd.service

+%systemd_post vgauthd.service vmtoolsd.service

 %preun

-%systemd_preun vmtoolsd.service

-%systemd_preun vgauthd.service

+%systemd_preun vmtoolsd.service vgauthd.service

 # Tell VMware that open-vm-tools is being uninstalled

 if [ "$1" = "0" -a                      \

      -e %{_bindir}/vmware-checkvm -a    \

@@ -81,8 +79,7 @@ fi

 %postun 

 /sbin/ldconfig

-%systemd_postun_with_restart vmtoolsd.service

-%systemd_postun_with_restart vgauthd.service

+%systemd_postun_with_restart vmtoolsd.service vgauthd.service

 %files 

 %defattr(-,root,root)

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

 %changelog

+*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 10.0.5-9

+-	Edit scriptlets.

 *       Fri Apr 29 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-8

 -       Combining all GOSC scripts patches and fixing bug#1648133.

 *       Tue Apr 19 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-7

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

-Summary:	'Free version of the SSH connectivity tools

+Summary:	Free version of the SSH connectivity tools

 Name:		openssh

 Version:	7.1p2

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	BSD

 URL:		http://openssh.org

 Group:		System Environment/Security

@@ -94,18 +94,28 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %pre

 getent group sshd >/dev/null || groupadd -g 50 sshd

 getent passwd sshd >/dev/null || useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false -u 50 sshd

+

 %preun

-/bin/systemctl disable sshd-keygen.service

-/bin/systemctl disable sshd.service

+%systemd_preun sshd.service sshd-keygen.service

+

 %post

 /sbin/ldconfig

-chown -v root:sys /var/lib/sshd

-/bin/systemctl enable sshd-keygen.service

-/bin/systemctl enable sshd.service

+if [ $1 -eq 1 ] ; then

+    chown -v root:sys /var/lib/sshd

+fi

+%systemd_post sshd.service sshd-keygen.service

 %postun

 /sbin/ldconfig

 %systemd_postun_with_restart sshd.service sshd-keygen.service

+if [ $1 -eq 0 ] ; then

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

+        userdel sshd

+    fi

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

+        groupdel sshd

+    fi

+fi

 %clean

 rm -rf %{buildroot}/*

@@ -127,8 +137,10 @@ rm -rf %{buildroot}/*

 %{_mandir}/man8/*

 %attr(700,root,sys)/var/lib/sshd

 %changelog

-*   Thu Mar 17 2016 Xiaolin Li <xiaolinl@vmware.com> 7.1p2-1

--   Updated to version 7.1p2

+*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 7.1p2-2

+-	Edit scriptlets.

+*   	Thu Mar 17 2016 Xiaolin Li <xiaolinl@vmware.com> 7.1p2-1

+-   	Updated to version 7.1p2

 *	Fri Feb 05 2016 Anish Swaminathan <anishs@vmware.com> 6.6p1-6

 -	Add pre install scripts in the rpm

 *   	Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com>  6.6p1-5

@@ -1,11 +1,10 @@

 Summary:	Git for operating system binaries

 Name:		ostree

 Version:	2015.7

-Release:	2%{?dist}

+Release:	3%{?dist}

 Source0:	http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.gz

 %define sha1 ostree=baa502aa46363cd4828d257fb87f5e18a7ed000a

 Source1:	91-ostree.preset

-#Patch0:		ostree_syntax_error_fix.patch

 License:	LGPLv2+

 URL:		http://live.gnome.org/OSTree

 Vendor:		VMware, Inc.

@@ -66,8 +65,6 @@ The %{name}-devel package includes the header files for the %{name} library

 git clone git://git.gnome.org/libglnx libglnx

 git clone https://github.com/mendsley/bsdiff bsdiff

-#pwd

-#%patch0 -p0

 %build

 env NOCONFIGURE=1 ./autogen.sh

 %configure \

@@ -126,8 +123,10 @@ rm -rf %{buildroot}

 %{_datadir}/gir-1.0/OSTree-1.0.gir

 %changelog

-*   Sat Jul 11 2015 Touseef Liaqat <tliaqat@vmware.com> 2015.7-2

--   Add dracut, mkinitcpio and libsoup as dependencies

+*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 2015.7-3

+-	Remove commented steps.

+*       Sat Jul 11 2015 Touseef Liaqat <tliaqat@vmware.com> 2015.7-2

+-       Add dracut, mkinitcpio and libsoup as dependencies

 *	Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 2015.7-1

 -	Updated the version

 *	Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 2014.11-1

deleted file mode 100644

@@ -1,10 +0,0 @@

-+++ src/libostree/ostree-repo_modified.c	2014-11-25 11:00:53.853017693 -0800

-@@ -2181,6 +2181,7 @@

- gboolean

- ostree_repo_pull_one_dir (OstreeRepo               *self,

-                           const char               *remote_name,

-+			   const char               *dir_to_pull,

-                           char                    **refs_to_fetch,

-                           OstreeRepoPullFlags       flags,

-                           OstreeAsyncProgress      *progress,

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

 Summary:	Connection pooler for PostgreSQL.

 Name:		pgbouncer

 Version:	1.7.2

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	BSD

 URL:		https://wiki.postgresql.org/wiki/PgBouncer

 Source0:        https://pgbouncer.github.io/downloads/files/1.7.2/%{name}-%{version}.tar.gz

@@ -48,18 +48,30 @@ WantedBy=multi-user.target

 EOF

 %pre

-/sbin/groupadd -r %{name}

-/sbin/useradd -g %{name} %{name}

+if ! getent group %{name} >/dev/null; then

+    /sbin/groupadd -r %{name}

+fi

+if ! getent passwd %{name} >/dev/null; then

+    /sbin/useradd -g %{name} %{name}

+fi

 %post

-chown %{name}:%{name} /var/log/%{name}

-chown %{name}:%{name} /var/run/%{name}

+if [ $1 -eq 1 ] ; then

+    chown %{name}:%{name} /var/log/%{name}

+    chown %{name}:%{name} /var/run/%{name}

+fi

 %postun

-/sbin/userdel pgbouncer

-/sbin/groupdel pgbouncer

-rm -rf /var/log/%{name}

-rm -rf /var/run/%{name}

+if [ $1 -eq 0 ] ; then

+    if getent passwd %{name} >/dev/null; then

+        /sbin/userdel %{name}

+    fi

+    if getent group %{name} >/dev/null; then

+        /sbin/groupdel %{name}

+    fi

+    rm -rf /var/log/%{name}

+    rm -rf /var/run/%{name}

+fi

 %files

 %defattr(-,root,root,-)

@@ -73,5 +85,7 @@ rm -rf /var/run/%{name}

 /var/run/pgbouncer

 %changelog

+*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 1.7.2-2

+-	Edit scriptlets.

 *       Thu Apr 28 2016 Kumar Kaushik <kaushikk@vmware.com> 1.7.2-1

 -       Initial Version.

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

 Summary:	A high-level scripting language

 Name:		python3

 Version:	3.5.1

-Release:	3%{?dist}

+Release:	4%{?dist}

 License:	PSF

 URL:		http://www.python.org/

 Group:		System Environment/Programming

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

 %post

 /sbin/ldconfig

-#ln -s %{_bindir}/python3 %{_bindir}/python

-#ln -s %{_bindir}/python3-config %{_bindir}/python-config

 ln -sf %{_libdir}/libpython3.5m.so %{_libdir}/libpython3.5.so

 %post libs

@@ -125,7 +123,9 @@ export PYTHONHOME=/usr

 export PYTHONPATH=/usr/lib/python3.5

 %postun

-rm %{_libdir}/libpython3.5.so

+if [ $1 -eq 0 ] ; then

+    rm %{_libdir}/libpython3.5.so

+fi

 /sbin/ldconfig

 %clean

@@ -186,12 +186,14 @@ rm -rf %{buildroot}/*

 %{_bindir}/idle*

 %changelog

-*   Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-3

--   update python to require python-libs

-*   Thu Apr 07 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.5.1-2

--   Providing python3 binaries instead of the minor versions.

-*   Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.1-1

--   Updated to version 3.5.1

+*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 3.5.1-4

+-	Edit scriptlets.

+*   	Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.5.1-3

+-   	update python to require python-libs

+*   	Thu Apr 07 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 3.5.1-2

+-   	Providing python3 binaries instead of the minor versions.

+*   	Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.1-1

+-   	Updated to version 3.5.1

 *	Wed Dec 09 2015 Anish Swaminathan <anishs@vmware.com> 3.4.3-3

 -	Edit post script.

 *	Mon Aug 17 2015 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.3-2

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

 Summary:	RPC program number mapper

 Name:		rpcbind

 Version:	0.2.3

-Release:	4%{?dist}

+Release:	5%{?dist}

 License:	BSD

 URL:		http://nfsv4.bullopensource.org

 Group:	    Applications/Daemons

@@ -70,9 +70,10 @@ fi

 %post

 /sbin/ldconfig

-chown -v root:sys /var/lib/rpcbind

-systemctl enable rpcbind.socket >/dev/null 2>&1

-systemctl enable rpcbind.service >/dev/null 2>&1

+if [ $1 -eq 1 ] ; then

+    chown -v root:sys /var/lib/rpcbind

+fi

+%systemd_post rpcbind.socket rpcbind.service

 %postun

 /sbin/ldconfig

@@ -81,6 +82,8 @@ systemctl enable rpcbind.service >/dev/null 2>&1

 %clean

 rm -rf %{buildroot}/*

 %changelog

+*	Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 0.2.3-5

+-	Edit scriptlets.

 *	Fri Feb 05 2016 Anish Swaminathan <anishs@vmware.com> 0.2.3-4

 -	Add pre install scripts in the rpm

 *	Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> 0.2.3-3

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

 Summary: 	Extra tools for rpm-ostree

 Name: 		rpm-ostree-toolbox

 Version: 	2015.12

-Release: 	1%{?dist}

+Release: 	2%{?dist}

 #VCS: https://github.com/cgwalters/rpm-ostree-toolbox

 # This tarball is generated via "make -C packaging -f Makefile.dist-packaging dist-snapshot"

 # which is really just a wrapper for "git archive".

@@ -34,50 +34,6 @@ Requires:	python2

 Requires:	shadow

 Requires:	perl-Config-IniFiles

 Requires:	perl-JSON-XS

-# 

-# %global unprivileged_user rpmostreecompose

-# %global unprivileged_group rpmostreecompose

-# 

-# Requires: python

-# Requires: python-iniparse

-# Requires: pygobject2

-# Requires: gjs

-# Requires: libvirt-python

-# Requires: libguestfs-tools-c

-# Requires: libguestfs-gobject

-# # Needed for libguests

-# Requires: kernel

-# 

-# Requires: rpm-ostree

-# Requires: lorax

-# 

-# %if 0%{?fedora}

-# Requires: docker-io

-# %else

-# Requires: docker

-# %endif

-# 

-# # Imagefactory

-# Requires: imagefactory >= 1.1.7-1

-# Requires: imagefactory-plugins-TinMan >= 1.1.7-1

-# Requires: imagefactory-plugins-OVA >= 1.1.7-1

-# Requires: imagefactory-plugins-vSphere >= 1.1.7-1

-# Requires: imagefactory-plugins-RHEVM >= 1.1.7-1

-# Requires: imagefactory-plugins-IndirectionCloud >= 1.1.7-1

-# 

-# Requires: VMDKstream >= 0.3-1

-# 

-# %if 0%{?rhel}

-# %else

-# Requires: libguestfs-xfs

-# %endif

-# # Needed for rpmostree-build-monitor

-# Requires:       python-qpid

-# Requires:       cyrus-sasl-gssapi

-# Requires:       python-saslwrapper

-# Requires(pre):  shadow-utils

-# Requires:       systemd-units

-# Requires(post): systemd-units

 %description

 Various utilities and scripts for working with rpm-ostree based

@@ -95,13 +51,23 @@ make %{?_smp_mflags}

 make install DESTDIR=%{buildroot} INSTALL="install -p -c"

 %pre

-getent group %{unprivileged_group} >/dev/null || groupadd -r %{unprivileged_group}

-getent passwd %{unprivileged_user} >/dev/null || \

-  useradd -r -g %{unprivileged_group} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "RPM OStree Toolbox user" %{unprivileged_user}

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

+getent passwd rpmostreecompose >/dev/null || \

+  useradd -r -g rpmostreecompose -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "RPM OStree Toolbox user" rpmostreecompose

 %post

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

+%postun

+if [ $1 -eq 0 ] ; then

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

+        userdel rpmostreecompose

+    fi

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

+        groupdel rpmostreecompose

+    fi

+fi

+

 %files

 %doc COPYING README.md src/py/config.ini.sample

 %{_bindir}/rpm-ostree-toolbox

@@ -110,11 +76,13 @@ getent passwd %{unprivileged_user} >/dev/null || \

 %{_mandir}/man1/%{name}*.gz

 %dir %{_localstatedir}/lib/%{name}

-%attr(0755,%{unprivileged_user},%{unprivileged_group}) %{_localstatedir}/lib/%{name}

+%attr(0755,rpmostreecompose,rpmostreecompose) %{_localstatedir}/lib/%{name}

 %changelog

+*   Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 2015.12-2

+-   Clean up the spec file.

 *   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 2015.12-1

 -   Updated to version 2015.12

-* Sat May 24 2014 Colin Walters <walters@verbum.org> - 2014.11-1

-- Initial package

+*   Sat May 24 2014 Colin Walters <walters@verbum.org> - 2014.11-1

+-   Initial package