[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 157d9d85b08e7b5e811065fd0cd0dbbee8613694

Roland Mas lolando at fusionforge.org
Mon Aug 4 16:28:28 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  157d9d85b08e7b5e811065fd0cd0dbbee8613694 (commit)
      from  29538e8e4785140bbabd01d3255a59fe6a744bd6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 157d9d85b08e7b5e811065fd0cd0dbbee8613694
Author: Roland Mas <lolando at debian.org>
Date:   Mon Aug 4 16:28:22 2014 +0200

    Un-deb-specific-ize pkginfo.inc.php (also used by the RPM packaging)

diff --git a/src/common/pkginfo.inc.php.template b/src/common/pkginfo.inc.php.template
new file mode 100644
index 0000000..49c2aa0
--- /dev/null
+++ b/src/common/pkginfo.inc.php.template
@@ -0,0 +1,5 @@
+<?php
+
+$forge_pkg_name = '@PKGNAME@';
+$forge_pkg_type = '@PLUCKERNAME@';
+$forge_pkg_version = '@PKGVERSION@';
diff --git a/src/fusionforge.spec b/src/fusionforge.spec
index a5fd9fc..e8bc8f6e 100644
--- a/src/fusionforge.spec
+++ b/src/fusionforge.spec
@@ -522,7 +522,7 @@ WHICH_VERSION=%{version}-%{release}
     -e "s!@PKGNAME@!${WHICH_FORGE}!g" \
     -e "s!@PKGVERSION@!${WHICH_VERSION}!g" \
     -e "s!@PLUCKERNAME@!${WHICH_TYPE}!g" \
-    <$RPM_BUILD_ROOT/%{FORGE_DIR}/deb-specific/pkginfo.inc.php \
+    <$RPM_BUILD_ROOT/%{FORGE_DIR}/common/pkginfo.inc.php.template \
     >$RPM_BUILD_ROOT/%{FORGE_DIR}/common/pkginfo.inc.php
 
 %{__rm} -f $RPM_BUILD_ROOT%{FORGE_DIR}/COPYING.php

-----------------------------------------------------------------------

Summary of changes:
 .../pkginfo.inc.php => common/pkginfo.inc.php.template}              |    0
 src/fusionforge.spec                                                 |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 copy src/{deb-specific/pkginfo.inc.php => common/pkginfo.inc.php.template} (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list