From 9a4216e17061f46773a7850ec1397ab5cefd4c25 Mon Sep 17 00:00:00 2001 From: tuxmaster Date: Wed, 30 Sep 2015 10:32:13 +0200 Subject: [PATCH 1/3] - Hilfsprogramm zum syncron halten --- Aktualisieren | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 Aktualisieren diff --git a/Aktualisieren b/Aktualisieren new file mode 100755 index 0000000..e021435 --- /dev/null +++ b/Aktualisieren @@ -0,0 +1,11 @@ +#!/bin/bash +Orginalname="Orginal" + +git remote -v|grep majn >/dev/null +if [ $? != 0 ]; then + echo "muss remote einbauen" + git remote add $Orginalname https://github.com/majn/telegram-purple.git +fi +git fetch $Orginalname +git checkout master +git merge $Orginalname/master From ba790edb64f986eb3e2725baf1047056a1f452e9 Mon Sep 17 00:00:00 2001 From: tuxmaster Date: Wed, 30 Sep 2015 12:53:59 +0200 Subject: [PATCH 2/3] - remove unneeded requirements from rpm spec file - remove source code fix from rpm spec file - fix source code permissions --- lodepng/lodepng.c | 0 lodepng/lodepng.h | 0 rpm/purple-telegram.spec | 9 +++++---- 3 files changed, 5 insertions(+), 4 deletions(-) mode change 100755 => 100644 lodepng/lodepng.c mode change 100755 => 100644 lodepng/lodepng.h diff --git a/lodepng/lodepng.c b/lodepng/lodepng.c old mode 100755 new mode 100644 diff --git a/lodepng/lodepng.h b/lodepng/lodepng.h old mode 100755 new mode 100644 diff --git a/rpm/purple-telegram.spec b/rpm/purple-telegram.spec index 885378f..21162ed 100644 --- a/rpm/purple-telegram.spec +++ b/rpm/purple-telegram.spec @@ -1,6 +1,6 @@ Name: purple-telegram Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Adds support for Libpurple based messengers Group: Applications/Internet License: GPLv2+ @@ -8,7 +8,6 @@ URL: https://github.com/majn/telegram-purple Source0: https://codeload.github.com/majn/telegram-purple/tar.gz/v%{version}.tar.gz BuildRequires: openssl-devel,glib2-devel,libpurple-devel,libwebp-devel -Requires: openssl %description Adds support for Telegram to Pidgin, Adium, Finch @@ -16,8 +15,6 @@ and other Libpurple based messengers. %prep %autosetup -#Remove executable perm from soure files. -find . -type f \( -name "*.c" -or -name "*.h" \)|xargs chmod -x 2>/dev/null %build %configure @@ -36,6 +33,10 @@ chmod 755 %{buildroot}/%{_libdir}/purple-2/telegram-purple.so %{_datadir}/pixmaps/pidgin/protocols/48/telegram.png %changelog +* Wed Sep 30 2015 tuxmaster 1.2.1-2 +- fix unneeded hard requirements +- source code fix not required anymore (better to fix the code) + * Thu Sep 17 2015 mjentsch 1.2.1-1 - update version to 1.2.1 From aa7a8d43f64dc9fe3a941ede9b3c2f783c256918 Mon Sep 17 00:00:00 2001 From: tuxmaster Date: Wed, 30 Sep 2015 12:59:36 +0200 Subject: [PATCH 3/3] =?UTF-8?q?-=20Aktualisieren=20tempor=C3=A4r=20entfern?= =?UTF-8?q?t.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aktualisieren | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100755 Aktualisieren diff --git a/Aktualisieren b/Aktualisieren deleted file mode 100755 index e021435..0000000 --- a/Aktualisieren +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -Orginalname="Orginal" - -git remote -v|grep majn >/dev/null -if [ $? != 0 ]; then - echo "muss remote einbauen" - git remote add $Orginalname https://github.com/majn/telegram-purple.git -fi -git fetch $Orginalname -git checkout master -git merge $Orginalname/master