Attachment 7166 Details for Bug 17011 – Patch for git-2.3.10-1.mga5.src.rpm SPEC file to add git-subtree

[patch] Patch for git-2.3.10-1.mga5.src.rpm SPEC file to add git-subtree

git-2.3.10-subtree.patch (text/plain), 2.23 KB, created by Scott Karns on 2015-10-25 15:57:18 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Karns

Created: 2015-10-25 15:57:18 CET

Size: 2.23 KB

patch

obsolete

>--- git.spec~	2015-10-06 11:43:39.000000000 -0600
>+++ git.spec	2015-10-25 08:30:51.467838944 -0600
>@@ -8,7 +8,7 @@
> 
> Name:    git
> Version: 2.3.10
>-Release: %mkrel 1
>+Release: %mkrel 1.1
> Epoch:   1
> 
> Summary: Global Information Tracker
>@@ -113,6 +113,15 @@
> Development files for git.
> 
> 
>+%package -n git-subtree
>+Summary:        Git subtree command
>+Group:          Development/Other
>+Requires:       git-core = %{epoch}:%{version}-%{release}
>+
>+%description -n git-subtree
>+Git subtree allows for the inclusion of a subproject within a
>+subdirectory of the main project.
>+
> %package -n git-svn
> Summary:        Git tools for importing Subversion repositories
> Group:          Development/Other
>@@ -212,6 +221,11 @@
> %define git_make_params prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=1
> %make %{git_make_params} all doc gitweb/gitweb.cgi
> 
>+# Make git-subtree
>+pushd contrib/subtree
>+%make %{git_make_params}
>+popd
>+
> # Produce RelNotes.txt.gz
> # sed trick changes "-x.y.z.txt" to "-x.y.z.0.txt" for ordering, then undoes it
> # use awk to print a newline before each RelNotes header
>@@ -223,6 +237,13 @@
> mkdir -p %{buildroot}%{_bindir}
> %makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="$RPM_OPT_FLAGS"
> make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot}
>+
>+# Install git-subtree and its doc
>+pushd contrib/subtree
>+%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="$RPM_OPT_FLAGS"
>+make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core htmldir=%{_docdir}/git-core DESTDIR=%{buildroot}
>+popd
>+
> # (cg) Copy the whole contrib dir as docs. It contains useful scripts.
> mkdir -p %{buildroot}%{_datadir}/doc/git-core
> cp -ar contrib %{buildroot}%{_datadir}/doc/git-core
>@@ -341,6 +362,10 @@
> %{_includedir}/git
> %{_libdir}/libgit.a
> 
>+%files -n git-subtree
>+%{_libdir}/git-core/*subtree*
>+%{_mandir}/man1/*subtree*.1*
>+
> %files -n git-svn
> %{_libdir}/git-core/*svn*
> %{_mandir}/man1/*svn*.1*
>@@ -377,6 +402,9 @@
> 
> 
> %changelog
>+* Sun Oct 25 2015 scottk <scottk> 1:2.3.10-1.1.mga5
>+- Include git-subtree
>+
> * Tue Oct 06 2015 luigiwalser <luigiwalser> 1:2.3.10-1.mga5
> + Revision: 886606
> - 2.3.10

--- git.spec~	2015-10-06 11:43:39.000000000 -0600
+++ git.spec	2015-10-25 08:30:51.467838944 -0600
@@ -8,7 +8,7 @@
 
 Name:    git
 Version: 2.3.10
-Release: %mkrel 1
+Release: %mkrel 1.1
 Epoch:   1
 
 Summary: Global Information Tracker
@@ -113,6 +113,15 @@
 Development files for git.
 
 
+%package -n git-subtree
+Summary:        Git subtree command
+Group:          Development/Other
+Requires:       git-core = %{epoch}:%{version}-%{release}
+
+%description -n git-subtree
+Git subtree allows for the inclusion of a subproject within a
+subdirectory of the main project.
+
 %package -n git-svn
 Summary:        Git tools for importing Subversion repositories
 Group:          Development/Other
@@ -212,6 +221,11 @@
 %define git_make_params prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=1
 %make %{git_make_params} all doc gitweb/gitweb.cgi
 
+# Make git-subtree
+pushd contrib/subtree
+%make %{git_make_params}
+popd
+
 # Produce RelNotes.txt.gz
 # sed trick changes "-x.y.z.txt" to "-x.y.z.0.txt" for ordering, then undoes it
 # use awk to print a newline before each RelNotes header
@@ -223,6 +237,13 @@
 mkdir -p %{buildroot}%{_bindir}
 %makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="$RPM_OPT_FLAGS"
 make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot}
+
+# Install git-subtree and its doc
+pushd contrib/subtree
+%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="$RPM_OPT_FLAGS"
+make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core htmldir=%{_docdir}/git-core DESTDIR=%{buildroot}
+popd
+
 # (cg) Copy the whole contrib dir as docs. It contains useful scripts.
 mkdir -p %{buildroot}%{_datadir}/doc/git-core
 cp -ar contrib %{buildroot}%{_datadir}/doc/git-core
@@ -341,6 +362,10 @@
 %{_includedir}/git
 %{_libdir}/libgit.a
 
+%files -n git-subtree
+%{_libdir}/git-core/*subtree*
+%{_mandir}/man1/*subtree*.1*
+
 %files -n git-svn
 %{_libdir}/git-core/*svn*
 %{_mandir}/man1/*svn*.1*
@@ -377,6 +402,9 @@
 
 
 %changelog
+* Sun Oct 25 2015 scottk <scottk> 1:2.3.10-1.1.mga5
+- Include git-subtree
+
 * Tue Oct 06 2015 luigiwalser <luigiwalser> 1:2.3.10-1.mga5
 + Revision: 886606
 - 2.3.10

Actions: View | Diff

Attachments on bug 17011: 7166