rpms/gitolite/devel gitolite.spec,1.1,1.2

Till Maas till at fedoraproject.org
Tue Feb 9 13:19:41 UTC 2010


Author: till

Update of /cvs/pkgs/rpms/gitolite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19183

Modified Files:
	gitolite.spec 
Log Message:
* Tue Feb 09 2010 Till Maas <opensource at till.name> - 0.95-4.20091216git
- RHEL defines %{_sharedstatedir} to be %{_prefix}/com, so use a %global
  redirection to set the homedir to a proper value (/var/lib).
  Red Hat Bug #185862



Index: gitolite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gitolite/devel/gitolite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gitolite.spec	20 Jan 2010 23:49:46 -0000	1.1
+++ gitolite.spec	9 Feb 2010 13:19:41 -0000	1.2
@@ -1,8 +1,14 @@
 %global perl_vendorlib %(eval $(perl -V:vendorlib); echo $vendorlib)
+# RHEL uses %%{_prefix}/com for %{_sharedstatedir} instead of /var/lib
+%if 0%{?rhel}
+%global gitolite_homedir /var/lib/%{name}
+%else
+%global gitolite_homedir %{_sharedstatedir}/%{name}
+%endif
 
 Name:           gitolite
 Version:        0.95
-Release:        3.20091216git%{?dist}
+Release:        4.20091216git%{?dist}
 Summary:        Highly flexible server for git directory version tracker
 
 Group:          Applications/System
@@ -64,7 +70,7 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 # Directory structure
-install -d $RPM_BUILD_ROOT%{_sharedstatedir}/%{name}
+install -d $RPM_BUILD_ROOT%{gitolite_homedir}
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -d $RPM_BUILD_ROOT%{perl_vendorlib}
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -83,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 # Add "gitolite" user per http://fedoraproject.org/wiki/Packaging/UsersAndGroups
 getent group %{name} >/dev/null || groupadd -r %{name}
 getent passwd %{name} >/dev/null || \
-useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /bin/sh \
+useradd -r -g %{name} -d %{gitolite_homedir} -s /bin/sh \
         -c "git repository hosting" %{name}
 
 
@@ -92,11 +98,16 @@ useradd -r -g %{name} -d %{_sharedstated
 %{_bindir}/*
 %{perl_vendorlib}/*
 %{_datadir}/%{name}
-%attr(-,%{name},%{name}) %{_sharedstatedir}/%{name}
+%attr(-,%{name},%{name}) %{gitolite_homedir}
 %doc doc/COPYING doc/*.html README
 
 
 %changelog
+* Tue Feb 09 2010 Till Maas <opensource at till.name> - 0.95-4.20091216git
+- RHEL defines %%{_sharedstatedir} to be %%{_prefix}/com, so use a %%global
+  redirection to set the homedir to a proper value (/var/lib).
+  Red Hat Bug #185862
+
 * Thu Jan 21 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0.95-3.20091216git
 - Add documentation
 - Rename upstream tarball



More information about the scm-commits mailing list