[packages/apache-mod_python] - fix versioning (not a git snapshot/repo) - rel 3
baggins
baggins at pld-linux.org
Mon Nov 4 14:55:25 CET 2013
commit c69332165fdd4d9fdfe0ae0c9b93ee313e91a0a9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Nov 4 14:54:59 2013 +0100
- fix versioning (not a git snapshot/repo)
- rel 3
apache-mod_python.spec | 4 +++-
no-git.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index bee620f..5f7989a 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -19,13 +19,14 @@ Summary(sl.UTF-8): Vključeni pythonski tolmač za spletni strežnik Apache
Summary(sv.UTF-8): En inbyggd Python-interpretator för webbservern Apache
Name: apache-mod_%{mod_name}
Version: 3.4.1
-Release: 2
+Release: 3
License: Apache
Group: Networking/Daemons/HTTP
Source0: http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
# Source0-md5: d27804354f1808ad55d432fd76ed9d05
Source1: %{name}.conf
Patch0: %{name}-httpd-not-needed.patch
+Patch1: no-git.patch
URL: http://www.modpython.org/
BuildRequires: apache-devel >= 2.0.52-7
BuildRequires: apr-devel >= 1:1.0.0
@@ -124,6 +125,7 @@ prestandan jämfört med den traditionella CGI-metoden.
%prep
%setup -q -n mod_%{mod_name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{__aclocal}
diff --git a/no-git.patch b/no-git.patch
new file mode 100644
index 0000000..cc07d6d
--- /dev/null
+++ b/no-git.patch
@@ -0,0 +1,31 @@
+--- mod_python-3.4.1/src/Makefile.in~ 2013-10-23 04:33:52.000000000 +0200
++++ mod_python-3.4.1/src/Makefile.in 2013-11-04 14:50:49.165054840 +0100
+@@ -64,16 +64,14 @@
+ rm -f Makefile .depend
+
+ version.c:
+- @MP_GIT_SHA=$$(git describe --always); \
+ echo > version.c ; \
+ echo "/* THIS FILE IS AUTO-GENERATED BY Makefile */" >> version.c ; \
+ echo "#include \"mp_version.h\"" >> version.c ; \
+- echo "const char * const mp_git_sha = \"$${MP_GIT_SHA}\";" >> version.c ; \
+ echo "const int mp_version_major = MP_VERSION_MAJOR;" >> version.c ; \
+ echo "const int mp_version_minor = MP_VERSION_MINOR;" >> version.c ; \
+ echo "const int mp_version_patch = MP_VERSION_PATCH;" >> version.c ; \
+- echo "const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c ; \
+- echo "const char * const mp_version_component = \"mod_python/\" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH) \"-$${MP_GIT_SHA}\";" >> version.c
++ echo "const char * const mp_version_string = MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH);" >> version.c ; \
++ echo "const char * const mp_version_component = \"mod_python/\" MP_VERSION_STRING(MP_VERSION_MAJOR,MP_VERSION_MINOR,MP_VERSION_PATCH);" >> version.c
+
+ # echo "const char * const mp_version_component = \"mod_python/\" #MP_VERSION_MAJOR \".\" #MP_VERSION_MINOR \".\" #MP_VERSION_PATCH \"-$${MP_GIT_SHA}\";" >> version.c
+
+--- mod_python-3.4.1/src/include/mod_python.h.in~ 2013-10-23 04:33:52.000000000 +0200
++++ mod_python-3.4.1/src/include/mod_python.h.in 2013-11-04 14:51:56.792279692 +0100
+@@ -133,7 +133,6 @@
+ #endif
+
+ /* version stuff */
+-extern const char * const mp_git_sha;
+ extern const int mp_version_major;
+ extern const int mp_version_minor;
+ extern const int mp_version_patch;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_python.git/commitdiff/c69332165fdd4d9fdfe0ae0c9b93ee313e91a0a9
More information about the pld-cvs-commit
mailing list