Merge branch 'master' of ssh://pkgs.fedoraproject.org/ypserv

Conflicts:
	ypserv.spec

ypserv.spec

@@ -187,7 +187,7 @@ if [ $1 == 2 ] ; then
                 master=`%{_libdir}/yp/makedbm -u $map 2>/dev/null | grep  YP_MASTER_NAME | sed -e 's/YP_MASTER_NAME//'`
                 if [ "x$master" != "x" ] ; then
                     echo "%{_libdir}/yp/ypxfr -f -h $master -c -d $newdomain $map" >> %rebuild_maps_script
-                fi
+		    fi
             fi
         done
         echo "make NOPUSH=true -C /var/yp" >> %rebuild_maps_script
@@ -219,12 +219,18 @@ fi
 %{_libdir}/yp
 %{_sbindir}/*
 %{_mandir}/*/*
-%{_includedir}/*/*
+%{_includedir}/rpcsvc
 
 %changelog
 * Tue Aug 12 2014 Honza Horak <hhorak@redhat.com> - 2.32.1-1
 - New upstream release 2.32.1
 
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.32-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon May 26 2014 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.32-2
+- Own %%{_includedir}/rpcsvc (RHBZ #1100354).
+
 * Mon Nov 18 2013 Honza Horak <hhorak@redhat.com> - 2.32-1
 - Update to new upstream version 2.32