tradej pushed to devassistant (f21). "Updated to newer upstream version (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 20 14:10:56 UTC 2015
>From eea2d775ccccc307843383faefca3b047ceecb1e Mon Sep 17 00:00:00 2001
From: Tomas Radej <tradej at redhat.com>
Date: Mon, 20 Apr 2015 16:00:09 +0200
Subject: Updated to newer upstream version
- Removed unnecessary patches
diff --git a/.gitignore b/.gitignore
index bee79d5..785cd45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/devassistant-0.9.1.tar.gz
/devassistant-0.9.2.tar.gz
/devassistant-0.9.3.tar.gz
+/devassistant-0.9.4.tar.gz
diff --git a/devassistant-0.9.3-fix-nodejs-assistants.patch b/devassistant-0.9.3-fix-nodejs-assistants.patch
deleted file mode 100644
index d0b687f..0000000
--- a/devassistant-0.9.3-fix-nodejs-assistants.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit ea9a21f2c1854a8f4a58a4acdd64514e50187a16
-Author: Slavek Kabrda <bkabrda at redhat.com>
-Date: Tue Nov 25 11:28:52 2014 +0100
-
- Make sure to create the top level directory and switch to it
-
-diff --git a/devassistant/data/assistants/crt/nodejs/app.yaml b/devassistant/data/assistants/crt/nodejs/app.yaml
-index a9e20f9..4b4650c 100644
---- a/devassistant/data/assistants/crt/nodejs/app.yaml
-+++ b/devassistant/data/assistants/crt/nodejs/app.yaml
-@@ -97,6 +97,8 @@ run:
- - $basename~: $(basename "$name")
- - if $(test -e "$name"):
- - log_e: '$name already exists, cannot proceed.'
-+- cl: mkdir -p "$dirname"
-+- cl: cd "$dirname"
- - cl: cp -r *appnodejs "$basename"
- - dda_c: "$basename"
- - cl: cd "$basename"
-diff --git a/devassistant/data/assistants/crt/nodejs/express.yaml b/devassistant/data/assistants/crt/nodejs/express.yaml
-index 36c1b33..641810a 100644
---- a/devassistant/data/assistants/crt/nodejs/express.yaml
-+++ b/devassistant/data/assistants/crt/nodejs/express.yaml
-@@ -110,6 +110,8 @@ run:
- - if $(test -e "$name"):
- - log_e: '$name already exists, cannot proceed.'
- - log_i: 'Creating Express.JS project $basename in $dirname ...'
-+- cl: mkdir -p "$dirname"
-+- cl: cd "$dirname"
- - cl: express --css stylus --ejs "$basename"
- - dda_c: $basename
- - cl: cd "$basename"
-
-commit 822c80193195af61c81be4a0ef61ae50c7653d88
-Author: Slavek Kabrda <bkabrda at redhat.com>
-Date: Tue Nov 25 11:08:32 2014 +0100
-
- Add forgotten nodejs-express dependency, rhbz#1167570
-
-diff --git a/devassistant/data/assistants/crt/nodejs/express.yaml b/devassistant/data/assistants/crt/nodejs/express.yaml
-index e26b8f1..36c1b33 100644
---- a/devassistant/data/assistants/crt/nodejs/express.yaml
-+++ b/devassistant/data/assistants/crt/nodejs/express.yaml
-@@ -33,6 +33,7 @@ dependencies:
- - rpm: ['nodejs-delayed-stream']
- - rpm: ['nodejs-devel']
- - rpm: ['nodejs-editor']
-+ - rpm: ['nodejs-express']
- - rpm: ['nodejs-forever-agent']
- - rpm: ['nodejs-form-data']
- - rpm: ['nodejs-formidable']
diff --git a/devassistant-nodejs-files.patch b/devassistant-nodejs-files.patch
deleted file mode 100644
index 2493d57..0000000
--- a/devassistant-nodejs-files.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3ec0ae9dd2bd348c021262aad20f3515a83884cc Mon Sep 17 00:00:00 2001
-From: Tomas Radej <tradej at redhat.com>
-Date: Tue, 9 Dec 2014 16:03:05 +0100
-Subject: [PATCH 3/3] Moved node.js files to the right location (rhbz#1147119)
-
----
- files/crt/nodejs/app.js | 6 ------
- files/crt/nodejs/app/app.js | 6 ++++++
- 2 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 files/crt/nodejs/app.js
- create mode 100644 files/crt/nodejs/app/app.js
-
-diff --git a/files/crt/nodejs/app.js b/files/crt/nodejs/app.js
-deleted file mode 100644
-index a3716b1..0000000
---- a/files/crt/nodejs/app.js
-+++ /dev/null
-@@ -1,6 +0,0 @@
--var http = require('http');
--http.createServer(function (req, res) {
-- res.writeHead(200, {'Content-Type': 'text/plain'});
-- res.end('Hello World\n');
--}).listen(1337, "127.0.0.1");
--console.log('Server running at http://127.0.0.1:1337/');
-diff --git a/files/crt/nodejs/app/app.js b/files/crt/nodejs/app/app.js
-new file mode 100644
-index 0000000..a3716b1
---- /dev/null
-+++ b/files/crt/nodejs/app/app.js
-@@ -0,0 +1,6 @@
-+var http = require('http');
-+http.createServer(function (req, res) {
-+ res.writeHead(200, {'Content-Type': 'text/plain'});
-+ res.end('Hello World\n');
-+}).listen(1337, "127.0.0.1");
-+console.log('Server running at http://127.0.0.1:1337/');
---
-2.1.0
-
diff --git a/devassistant-php-sample-location.patch b/devassistant-php-sample-location.patch
deleted file mode 100644
index a074cf8..0000000
--- a/devassistant-php-sample-location.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2aeab7dfd45c129014475b289814ba6b222a678d Mon Sep 17 00:00:00 2001
-From: Tomas Radej <tradej at redhat.com>
-Date: Tue, 16 Dec 2014 17:09:27 +0100
-Subject: [PATCH] Correct location for phpMyAdmin (rhbz #1173871)
-
----
- files/crt/php/lamp/apache_config.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/crt/php/lamp/apache_config.sh b/files/crt/php/lamp/apache_config.sh
-index a81b3c6..bd72c89 100755
---- a/files/crt/php/lamp/apache_config.sh
-+++ b/files/crt/php/lamp/apache_config.sh
-@@ -2,7 +2,7 @@
-
- MODULE_CONFIG=/etc/httpd/conf.modules.d/00-base.conf
- USERDIR_CONF=/etc/httpd/conf.d/userdir.conf
--SAMPLE_PHPMYADMIN=/usr/share/phpMyAdmin/config.sample.inc.php
-+SAMPLE_PHPMYADMIN=/usr/share/doc/phpMyAdmin/config.sample.inc.php
- NEW_PHPMYADMIN=/usr/share/phpMyAdmin/config.inc.php
- PHP=/usr/bin/php
-
---
-2.1.0
-
diff --git a/devassistant.spec b/devassistant.spec
index 9741233..5c142db 100644
--- a/devassistant.spec
+++ b/devassistant.spec
@@ -1,8 +1,8 @@
%global shortname da
Name: devassistant
-Version: 0.9.3
-Release: 4%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
Summary: DevAssistant - Making life easier for developers
License: GPLv2+ and CC-BY-SA
@@ -16,17 +16,6 @@ Source1: %{name}.desktop
Source2: %{name}.appdata.xml
Patch0: devassistant-0.6.0-alter-paths-for-fedora.patch
-# Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1167570
-# Combined upstream patches:
-# https://github.com/devassistant/devassistant-assistants-fedora/commit/822c80193195af61c81be4a0ef61ae50c7653d88
-# https://github.com/devassistant/devassistant-assistants-fedora/commit/ea9a21f2c1854a8f4a58a4acdd64514e50187a16
-Patch1: devassistant-0.9.3-fix-nodejs-assistants.patch
-
-# Backported patch from upstream's devassistant/data submodule (#rhbz 1147119)
-Patch2: %{name}-nodejs-files.patch
-
-# Backported patch for wrong phpMyAdmin sample location
-Patch3: %{name}-php-sample-location.patch
BuildArch: noarch
@@ -67,11 +56,6 @@ working with source control, etc.
# remove bundled egg-info
rm -rf %{name}.egg-info
-%patch1 -p1
-
-%patch2 -p1 -d devassistant/data
-%patch3 -p1 -d devassistant/data
-
cp %{SOURCE1} .
sed -i '/Version/d' %{name}.desktop
@@ -161,6 +145,10 @@ fi
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
%changelog
+* Mon Apr 20 2015 Tomas Radej <tradej at redhat.com> - 0.9.4-1
+- Updated to newer upstream version
+- Removed unnecessary patches
+
* Tue Dec 16 2014 Tomas Radej <tradej at redhat.com> - 0.9.3-4
- Fix phpMyAdmin sample location
Resolves: rhbz#1173871
diff --git a/sources b/sources
index 59e2eff..4cc022e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-535369399bbfddd6dc95cc9b071a10c5 devassistant-0.9.3.tar.gz
+9e67f3c72193559cb13137a0b61a4b79 devassistant-0.9.4.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/devassistant.git/commit/?h=f21&id=eea2d775ccccc307843383faefca3b047ceecb1e
More information about the scm-commits
mailing list