Skip to content

Commit 0cc2edd

Browse files
committed
Problem: out of date with zproject
Solution: regenerate
1 parent ab1b34b commit 0cc2edd

File tree

4 files changed

+43
-25
lines changed

4 files changed

+43
-25
lines changed

.obs/workflows.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
pull_request:
2+
steps:
3+
- branch_package:
4+
source_project: network:messaging:zeromq:git-draft
5+
source_package: zproject
6+
target_project: network:messaging:zeromq:ci
7+
filters:
8+
event: pull_request
9+
merge:
10+
steps:
11+
- trigger_services:
12+
project: network:messaging:zeromq:git-stable
13+
package: zproject
14+
filters:
15+
event: push
16+
branches:
17+
only:
18+
- master
19+
release:
20+
steps:
21+
- trigger_services:
22+
project: network:messaging:zeromq:release-stable
23+
package: zproject
24+
- trigger_services:
25+
project: network:messaging:zeromq:release-draft
26+
package: zproject
27+
filters:
28+
event: tag_push

packaging/debian/rules

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ ifneq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
3030
DOCS=no
3131
endif
3232

33-
# Workaround for automake < 1.14 bug
34-
$(shell dpkg --compare-versions `dpkg-query -W -f='$${Version}\n' automake` lt 1:1.14 && mkdir -p config)
3533
$(shell test -f src/Makemodule-local.am || touch src/Makemodule-local.am)
3634

3735
override_dh_strip:
File renamed without changes.

packaging/obs/_service

+15-23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<services>
2-
<service name="tar_scm">
2+
<service name="obs_scm">
33
<param name="url">https://github.com/zeromq/zproject</param>
44
<param name="scm">git</param>
55
<!-- delete to build from latest master on each refresh -->
@@ -11,67 +11,59 @@
1111
<param name="exclude">.git</param>
1212
<param name="changesgenerate">enable</param>
1313
<param name="filename">zproject</param>
14+
<param name="extract">packaging/debian/zproject.dsc</param>
15+
<param name="extract">packaging/redhat/zproject.spec</param>
1416
</service>
1517

16-
<!-- extract redhat packaging -->
17-
<service name="extract_file">
18-
<param name="archive">*.tar</param>
19-
<param name="files">*/packaging/redhat/zproject.spec</param>
20-
<param name="outfilename">zproject.spec</param>
21-
</service>
18+
<service name="tar" mode="buildtime"/>
2219

2320
<!-- extract debian packaging -->
24-
<service name="extract_file">
25-
<param name="archive">*.tar</param>
26-
<param name="files">*/packaging/debian/zproject.dsc.obs</param>
27-
<param name="outfilename">zproject.dsc</param>
28-
</service>
29-
<service name="extract_file">
21+
<service name="extract_file" mode="buildtime">
3022
<param name="archive">*.tar</param>
31-
<param name="files">*/packaging/debian/changelog</param>
23+
<param name="files">*/packaging/debian/changelog</param>
3224
<param name="outfilename">debian.changelog</param>
3325
</service>
34-
<service name="extract_file">
26+
<service name="extract_file" mode="buildtime">
3527
<param name="archive">*.tar</param>
3628
<param name="files">*/packaging/debian/compat</param>
3729
<param name="outfilename">debian.compat</param>
3830
</service>
39-
<service name="extract_file">
31+
<service name="extract_file" mode="buildtime">
4032
<param name="archive">*.tar</param>
4133
<param name="files">*/packaging/debian/control</param>
4234
<param name="outfilename">debian.control</param>
4335
</service>
44-
<service name="extract_file">
36+
<service name="extract_file" mode="buildtime">
4537
<param name="archive">*.tar</param>
4638
<param name="files">*/packaging/debian/copyright</param>
4739
<param name="outfilename">debian.copyright</param>
4840
</service>
49-
<service name="extract_file">
41+
<service name="extract_file" mode="buildtime">
5042
<param name="archive">*.tar</param>
5143
<param name="files">*/packaging/debian/zproject.install</param>
5244
<param name="outfilename">debian.zproject.install</param>
5345
</service>
54-
<service name="extract_file">
46+
<service name="extract_file" mode="buildtime">
5547
<param name="archive">*.tar</param>
5648
<param name="files">*/packaging/debian/zproject.manpages</param>
5749
<param name="outfilename">debian.zproject.manpages</param>
5850
</service>
59-
<service name="extract_file">
51+
<service name="extract_file" mode="buildtime">
6052
<param name="archive">*.tar</param>
6153
<param name="files">*/packaging/debian/format</param>
6254
<param name="outfilename">debian.format</param>
6355
</service>
64-
<service name="extract_file">
56+
<service name="extract_file" mode="buildtime">
6557
<param name="archive">*.tar</param>
6658
<param name="files">*/packaging/debian/rules</param>
6759
<param name="outfilename">debian.rules</param>
6860
</service>
6961

70-
<service name="set_version">
62+
<service name="set_version" mode="buildtime">
7163
<param name="basename">zproject</param>
7264
</service>
7365

74-
<service name="recompress">
66+
<service name="recompress" mode="buildtime">
7567
<param name="file">*.tar</param>
7668
<param name="compression">gz</param>
7769
</service>

0 commit comments

Comments
 (0)