aboutsummaryrefslogtreecommitdiff
path: root/gbp-test2.data/Add-packaging-files.patch
blob: 3b773693c5167585f9557284b29f086eaad50ab7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Tue, 13 Nov 2012 13:35:52 +0200
Subject: [PATCH] Add packaging files

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
 packaging/bar.tar.gz     | Bin 0 -> 177 bytes
 packaging/foo.txt        |   3 +++
 packaging/gbp-test2.spec |  48 +++++++++++++++++++++++++++++++++++++++++++++++
 packaging/my.patch       |   9 +++++++++
 packaging/my2.patch      |   7 +++++++
 packaging/my3.patch      |   7 +++++++
 6 files changed, 74 insertions(+)
 create mode 100644 packaging/bar.tar.gz
 create mode 100644 packaging/foo.txt
 create mode 100644 packaging/gbp-test2.spec
 create mode 100644 packaging/my.patch
 create mode 100644 packaging/my2.patch
 create mode 100644 packaging/my3.patch

diff --git a/packaging/bar.tar.gz b/packaging/bar.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..f5dae8035202d6206a72803f35b756e8fbcb1d6c
GIT binary patch
literal 177
zcmb2|=3oe$-XFlg{Pvt9Uz34I%foe+M|U?Y3Ej|XZQEqNf@_H&tG8#*a`B^EtqUIh
zSJl^_d?txcZ^=iwt5d!t%uQXNpR?}%&7R7Xtw!E+*RF}oOukZJw%zN?lGS#<^mZvM
z($l+B_5a5uZ71{N3o74k`|Uev%09g%IZa0vb^nX<%+SB|HTQOlhOg$-{%+^@uY+Ir
arH6}VetLbE0U3OFKX1)<rOyl+3=9C`8d6&T

literal 0
HcmV?d00001

diff --git a/packaging/foo.txt b/packaging/foo.txt
new file mode 100644
index 0000000..25ed442
--- /dev/null
+++ b/packaging/foo.txt
@@ -0,0 +1,3 @@
+FOO:
+
+file for testing rpm support of git-buildpackage.
diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec
new file mode 100644
index 0000000..61aae33
--- /dev/null
+++ b/packaging/gbp-test2.spec
@@ -0,0 +1,48 @@
+Name:       gbp-test2
+Summary:    Test package 2 for git-buildpackage
+Epoch:      1
+Version:    2.0
+Release:    0
+Group:      Development/Libraries
+License:    GPLv2
+Source10:   ftp://ftp.host.com/%{name}-%{version}.tar.gz
+Source:     foo.txt
+Source20:   bar.tar.gz
+# Gbp-Ignore-Patches: 0
+Patch:      my.patch
+Patch10:    my2.patch
+Patch20:    my3.patch
+Packager:   Markus Lehtonen <markus.lehtonen@linux.intel.com>
+
+%description
+Package for testing the RPM functionality of git-buildpackage.
+Version 2 which has packaging and development in the same
+git branch.
+
+
+%prep
+%setup -T -n %{name}-%{version} -c -a 10
+
+%patch
+%patch -P 10 -p1
+
+echo "Do things"
+
+# Gbp-Patch-Macros
+
+%build
+make
+
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_datadir}/%{name}
+cp -R * %{buildroot}/%{_datadir}/%{name}
+install %{SOURCE0} %{buildroot}/%{_datadir}/%{name}
+
+
+
+%files
+%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}
diff --git a/packaging/my.patch b/packaging/my.patch
new file mode 100644
index 0000000..aa4eb5c
--- /dev/null
+++ b/packaging/my.patch
@@ -0,0 +1,9 @@
+diff --git a/dummy.sh b/dummy.sh
+index 8c33db6..6f04268 100755
+--- dummy.sh
++++ dummy.sh
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ 
+-echo "Hello world 2.0"
++echo "Hello GBP 2.0"
diff --git a/packaging/my2.patch b/packaging/my2.patch
new file mode 100644
index 0000000..ad5ca2d
--- /dev/null
+++ b/packaging/my2.patch
@@ -0,0 +1,7 @@
+diff --git a/mydir/myfile.txt b/mydir/myfile.txt
+new file mode 100644
+index 0000000..2cdad29
+--- /dev/null
++++ b/mydir/myfile.txt
+@@ -0,0 +1 @@
++Dummy
diff --git a/packaging/my3.patch b/packaging/my3.patch
new file mode 100644
index 0000000..9fee859
--- /dev/null
+++ b/packaging/my3.patch
@@ -0,0 +1,7 @@
+diff --git a/README b/README
+index a1311cb..a59f1b9 100644
+--- a/README
++++ b/README
+@@ -1 +1 @@
+-Just for testing git-buildpackage.
++Just for testing GBP.
-- 
2.1.4