x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

buildscripts.git - master (branch) updated: cc8c98a1f6b2ad748214df80931fed74a7e7bc89
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via cc8c98a1f6b2ad748214df80931fed74a7e7bc89 (commit) from 21eb682c31d5acba54b95f7cdab0f7592f05c632 (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 cc8c98a1f6b2ad748214df80931fed74a7e7bc89 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 30 00:44:14 2013 +0100 handle noarch packages, only build them once ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 04cbc35..30ee430 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -173,6 +173,8 @@ build_packages() { PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }') PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//') + IS_NOARCH=$(cat $PROJECT.spec | egrep "^BuildArch:.*noarch\$" 1>/dev/null 2>/dev/null && echo yes) + if [ "$COMPONENT" = "$COMPONENT_NIGHTLY" ]; then IS_RELEASE="0" else @@ -196,25 +198,9 @@ build_packages() { test -z $CODENAMES || echo $line | grep $CODENAMES || break - # modify the section for non-main package builds - - ### TODO: How to host different builds (releases / nightlies in the same repository???) - - #[ "x$COMPONENT" != "xmain" ] && { - # mv debian/control debian/control.tmp - # cat debian/control.tmp | sed "s#Section:[\ ]*$.*$#Section: $COMPONENT/\1#g" > debian/control - #} - # modify changelog for this build - ### TODO: manipulate the version string in the .spec file - - #if [ "$COMPONENT" != "$COMPONENT_NIGHTLY" ]; then - # dch --distribution $VERSION --force-distribution -l "+git$DATE.$GITREV+$l_CODENAME.$COMPONENT." "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository (Git commit: $GIT_OBJECT_ID)." - #else - # dch --distribution $VERSION --force-distribution -l "~git$DATE.$GITREV+$l_CODENAME.$COMPONENT." "Development-Snapshot!!! Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository (Git commit: $GIT_OBJECT_ID)." - #fi - + ### TODO: add changelog entry for this automatic build mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{x86_64,i386} @@ -227,12 +213,12 @@ build_packages() { # echo $PACKAGE_WITHOUT_OTHERMIRROR | grep $PROJECT >/dev/null || OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT" #fi - [ "x$SKIP_ARCH" != "xx86_64" ] && { + if [ "x$SKIP_ARCH" != "xx86_64" ] || [ "$IS_NOARCH" = "yes" ]; then mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm - } - [ "x$SKIP_ARCH" != "xi386" ] && { + fi + if [ "x$SKIP_ARCH" != "xi386" ] && [ "$IS_NOARCH" != "yes" ]; then mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm - } + fi done } done hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

buildscripts.git - master (branch) updated: 21eb682c31d5acba54b95f7cdab0f7592f05c632
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via 21eb682c31d5acba54b95f7cdab0f7592f05c632 (commit) from 0caea4a7d865166b1f2e55b996d8ced19387e319 (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 21eb682c31d5acba54b95f7cdab0f7592f05c632 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 30 00:17:33 2013 +0100 introduce variable ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 02e7a32..04cbc35 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -174,10 +174,11 @@ build_packages() { PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//') if [ "$COMPONENT" = "$COMPONENT_NIGHTLY" ]; then - sed -i $PROJECT.spec -e "s/%{?dist}/.0.git$DATE.$GITREV.$COMPONENT%{?dist}/" + IS_RELEASE="0" else - sed -i $PROJECT.spec -e "s/%{?dist}/.1.git$DATE.$GITREV.$COMPONENT%{?dist}/" + IS_RELEASE="1" fi + sed -i $PROJECT.spec -e "s/%{?dist}/.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT%{?dist}/" mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION @@ -227,10 +228,10 @@ build_packages() { #fi [ "x$SKIP_ARCH" != "xx86_64" ] && { - mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm + mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm } [ "x$SKIP_ARCH" != "xi386" ] && { - mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm + mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm } done } hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

buildscripts.git - master (branch) updated: 0caea4a7d865166b1f2e55b996d8ced19387e319
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via 0caea4a7d865166b1f2e55b996d8ced19387e319 (commit) from 42fcd7edd771e2d22b70406c55aef3e0785ba599 (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 0caea4a7d865166b1f2e55b996d8ced19387e319 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 30 00:14:03 2013 +0100 tilde not allowed in RPM version strings, use some other way to make stable release supercede nightly builds ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 2f856a6..02e7a32 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -173,8 +173,11 @@ build_packages() { PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }') PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//') - sed -i $PROJECT.spec -e "s/%{?dist}/~git$DATE.$GITREV.$COMPONENT%{?dist}/" - + if [ "$COMPONENT" = "$COMPONENT_NIGHTLY" ]; then + sed -i $PROJECT.spec -e "s/%{?dist}/.0.git$DATE.$GITREV.$COMPONENT%{?dist}/" + else + sed -i $PROJECT.spec -e "s/%{?dist}/.1.git$DATE.$GITREV.$COMPONENT%{?dist}/" + fi mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

buildscripts.git - master (branch) updated: 42fcd7edd771e2d22b70406c55aef3e0785ba599
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via 42fcd7edd771e2d22b70406c55aef3e0785ba599 (commit) from 98c2c20b15e64d3730ec32b6019e5d72f070fa24 (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 42fcd7edd771e2d22b70406c55aef3e0785ba599 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Nov 30 00:10:19 2013 +0100 search for SRPMs in /rpmbuild directory ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 2fcdb59..2f856a6 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -224,10 +224,10 @@ build_packages() { #fi [ "x$SKIP_ARCH" != "xx86_64" ] && { - mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm + mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm } [ "x$SKIP_ARCH" != "xi386" ] && { - mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm + mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm } done } hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

buildscripts.git - master (branch) updated: 98c2c20b15e64d3730ec32b6019e5d72f070fa24
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via 98c2c20b15e64d3730ec32b6019e5d72f070fa24 (commit) from 7774c9200054ed4d18d50cf4964b912cdb3aaafe (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 98c2c20b15e64d3730ec32b6019e5d72f070fa24 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 29 23:45:32 2013 +0100 manipulate %_topdir macro when evoking rpmbuild ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index ab85fcc..2fcdb59 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -95,7 +95,6 @@ prepare_workspace() { mkdir -p $PKGDIST/rpmbuild/SOURCES # make sure our local working copy is up to date... - if [ -d "$PROJECT_DIR/.git" ]; then cd "$PROJECT_DIR" && git reset --hard git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT @@ -180,7 +179,7 @@ build_packages() { tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION # create the SRPM package - rpmbuild --dbpath $PKGDIST/rpmbuild -bs $PROJECT.spec + rpmbuild -D "%_topdir $PKGDIST/rpmbuild" -bs $PROJECT.spec # clean up the Git clone from the temp folder cd && rm $TEMP_DIR/$PROJECT -Rf hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.4-8-g4696734
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via 4696734c484f253f87ffaf7d180dfbf0ed5cda16 (commit) from f73f9800d08537b23becd387319d2aef64f49c08 (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 4696734c484f253f87ffaf7d180dfbf0ed5cda16 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 29 21:31:33 2013 +0100 Ship cups-x2go.spec (RPM package definitions) in upstream project. (Thanks to the Fedora package maintainers). ----------------------------------------------------------------------- Summary of changes: cups-x2go.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 ++ 2 files changed, 56 insertions(+) create mode 100644 cups-x2go.spec The diff of changes is: diff --git a/cups-x2go.spec b/cups-x2go.spec new file mode 100644 index 0000000..e58438c --- /dev/null +++ b/cups-x2go.spec @@ -0,0 +1,54 @@ +Name: cups-x2go +Version: 3.0.1.0 +Release: 0x2go%{?dist} +Summary: CUPS backend for printing from X2Go + +Group: System Environment/Libraries +License: GPLv2+ +URL: http://www.x2go.org/ +Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz + +BuildArch: noarch +Requires: cups +Requires: ghostscript + +%description +CUPS backend for printing from X2Go. + + +%prep +%setup -q + + +%build + + +%install +mkdir -p %{buildroot}%{_prefix}/lib/cups/backend/ +install -pm700 cups-x2go %{buildroot}%{_prefix}/lib/cups/backend/ +mkdir -p %{buildroot}%{_sysconfdir}/cups/ +cp -p cups-x2go.conf %{buildroot}%{_sysconfdir}/cups/ +mkdir -p %{buildroot}%{_datadir}/ppd/cups-x2go/ +cp -p CUPS-X2GO.ppd %{buildroot}%{_datadir}/ppd/cups-x2go/ +mkdir -p %{buildroot}%{_datadir}/x2go/versions +cp -p VERSION.cups-x2go %{buildroot}%{_datadir}/x2go/versions/ + + +%files +%{_prefix}/lib/cups/backend/cups-x2go +%config(noreplace) %{_sysconfdir}/cups/cups-x2go.conf +%{_datadir}/ppd/cups-x2go/ +%{_datadir}/x2go/ + + +%changelog +* Wed Sep 4 2013 Orion Poplawski <orion(a)cora.nwra.com> 3.0.0.4-2 +- Use install to set permissions on cups-x2go +- Drop %%doc for now +- Mark config file as %%config(noreplace) +- Fix Group +- Drop tabs + +* Fri Dec 14 2012 Orion Poplawski <orion(a)cora.nwra.com> 3.0.0.4-1 +- Initial Fedora package + diff --git a/debian/changelog b/debian/changelog index d2a1ba7..47f21af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ cups-x2go (3.0.1.0-0x2go1) UNRELEASED; urgency=low information. (Fixes: #299). * debian/source/format: + Switch to format 1.0. + * Ship cups-x2go.spec (RPM package definitions) in upstream project. (Thanks + to the Fedora package maintainers). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Nov 2012 17:10:22 +0100 hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).

1 0

buildscripts.git - master (branch) updated: 7774c9200054ed4d18d50cf4964b912cdb3aaafe
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via 7774c9200054ed4d18d50cf4964b912cdb3aaafe (commit) from bb6fb7106e9339981959adfa3c59b3d0ee328c55 (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 7774c9200054ed4d18d50cf4964b912cdb3aaafe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 29 21:23:08 2013 +0100 place rpmbuild dbpath into , fix build cruft clean up ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 50b2a57..ab85fcc 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -92,7 +92,7 @@ prepare_workspace() { rm -f "$PROJECT_DIR/RPM_BUILDS_FOR" # create rpmbuild subdirectories - mkdir -p ~/rpmbuild/SOURCES + mkdir -p $PKGDIST/rpmbuild/SOURCES # make sure our local working copy is up to date... @@ -144,13 +144,10 @@ clear_pkgdist() { for l_ARCH in x86_64 i386; do [ "x$SKIP_ARCH" != "x$l_ARCH" ] && { mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf" - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.changes - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.upload - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.build - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.dsc - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT_"*.tar.gz - rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.deb + #rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf" + rm -f "$PKGDIST/rpmbuild/SOURCES/$PROJECT-"*.tar.gz + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/"*.log + rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/$PROJECT-"*.rpm } done done @@ -165,6 +162,7 @@ build_packages() { TEMP_DIR="$(mktemp -d --tmpdir=$TEMP_BASE)" mkdir -p "$TEMP_DIR/$PROJECT" chmod 2770 "$TEMP_DIR" -Rf + cd "$PROJECT_DIR" git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/" cd $TEMP_DIR @@ -179,10 +177,10 @@ build_packages() { sed -i $PROJECT.spec -e "s/%{?dist}/~git$DATE.$GITREV.$COMPONENT%{?dist}/" mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION - tar -czf ~/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION + tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION # create the SRPM package - rpmbuild -bs $PROJECT.spec + rpmbuild --dbpath $PKGDIST/rpmbuild -bs $PROJECT.spec # clean up the Git clone from the temp folder cd && rm $TEMP_DIR/$PROJECT -Rf hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

buildscripts.git - master (branch) updated: bb6fb7106e9339981959adfa3c59b3d0ee328c55
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via bb6fb7106e9339981959adfa3c59b3d0ee328c55 (commit) from 6cf5e91bfd98ebee80b8bc31f459b549a5b96f32 (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 bb6fb7106e9339981959adfa3c59b3d0ee328c55 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 29 17:15:11 2013 +0100 RPM based distro use x86_64 rather than amd64 ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 82b8e0a..50b2a57 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -141,7 +141,7 @@ clear_pkgdist() { # the wrong distribution here... test -z $CODENAMES || echo $line | grep $CODENAMES || break - for l_ARCH in amd64 i386; do + for l_ARCH in x86_64 i386; do [ "x$SKIP_ARCH" != "x$l_ARCH" ] && { mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" rm -f "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/dupload.conf" @@ -250,7 +250,7 @@ upload_packages() { # the wrong distribution here... test -z $CODENAMES || echo $line | grep $CODENAMES || break - for l_ARCH in amd64 i386; do + for l_ARCH in x86_64 i386; do [ "x$SKIP_ARCH" != "x$l_ARCH" ] && { cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH" hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

x2goclient.git - master (branch) updated: 4.0.1.1-33-ga714f47
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via a714f4715a96361a00cacbefd7b03d145fd0be31 (commit) from e0b13428082ebfc7895c34a084cf2e4929bc1248 (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 a714f4715a96361a00cacbefd7b03d145fd0be31 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 29 16:50:21 2013 +0100 adapt version scheme in .spec file ----------------------------------------------------------------------- Summary of changes: x2goclient.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2goclient.spec b/x2goclient.spec index 708c14b..43f84a4 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,6 +1,6 @@ Name: x2goclient Version: 4.0.1.2 -Release: 0.1%{?dist} +Release: 0x2go1%{?dist} Summary: Graphical client for use with the X2Go network based computing environment Group: Applications/Communications hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

buildscripts.git - master (branch) updated: 6cf5e91bfd98ebee80b8bc31f459b549a5b96f32
by git-admin＠x2go.org 29 Nov '13

29 Nov '13

The branch, master has been updated via 6cf5e91bfd98ebee80b8bc31f459b549a5b96f32 (commit) from 6f2fd62cf4e9c0d62a01b6196f51872164c78855 (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 6cf5e91bfd98ebee80b8bc31f459b549a5b96f32 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 29 16:49:37 2013 +0100 build packages with special version scheme ----------------------------------------------------------------------- Summary of changes: bin/build-rpm-package | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 751217e..82b8e0a 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -168,14 +168,15 @@ build_packages() { cd "$PROJECT_DIR" git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/" cd $TEMP_DIR + GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null) rm -Rf "$PROJECT/.git" - cp $PROJECT/$PROJECT.spec . + mv $PROJECT/$PROJECT.spec . UPSTREAM_VERSION=$(cat $PROJECT.spec | egrep "^Version:.*" | awk '{ print $2 }') PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }') PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//') - GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null) + sed -i $PROJECT.spec -e "s/%{?dist}/~git$DATE.$GITREV.$COMPONENT%{?dist}/" mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION tar -czf ~/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION @@ -226,10 +227,10 @@ build_packages() { #fi [ "x$SKIP_ARCH" != "xx86_64" ] && { - mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.src.rpm + mock -r ${l_DIST}-${l_CODENAME}-x86_64 --result $PKGDIST/$l_DIST/$l_CODENAME/x86_64 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm } [ "x$SKIP_ARCH" != "xi386" ] && { - mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.src.rpm + mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE~git$DATE.$GITREV.$COMPONENT.src.rpm } done } hooks/post-receive -- buildscripts.git (X2Go packaging scripts) 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 "buildscripts.git" (X2Go packaging scripts).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits