Changes of Revision 349

libosmocore.spec Changed
x
 
1
@@ -14,13 +14,13 @@
2
 
3
 Name:           libosmocore
4
 Requires: osmocom-master
5
-Version: 1.9.0.209.e0c63
6
+Version: 1.9.0.214.14405
7
 Release:        0
8
 Summary:        The Open Source Mobile Communications Core Library
9
 License:        GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND AGPL-3.0-or-later
10
 Group:          Productivity/Telephony/Utilities
11
 Url:            https://osmocom.org/projects/libosmocore/wiki/Libosmocore
12
-Source: libosmocore_1.9.0.209.e0c63.tar.xz
13
+Source: libosmocore_1.9.0.214.14405.tar.xz
14
 Source1: rpmlintrc
15
 BuildRequires:  automake >= 1.6
16
 BuildRequires:  libtool >= 2
17
commit_14405799e89c320cae8d3df754234f31681b2fc9.txt Added
commit_e0c63ec8c7233971636c43f00149104b35b3abae.txt Deleted
libosmocore_1.9.0.209.e0c63.dsc -> libosmocore_1.9.0.214.14405.dsc Changed
22
 
1
@@ -2,7 +2,7 @@
2
 Source: libosmocore
3
 Binary: libosmocore, libosmocodec4, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore21, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm20, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty13, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
4
 Architecture: any all
5
-Version: 1.9.0.209.e0c63
6
+Version: 1.9.0.214.14405
7
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
8
 Homepage: https://projects.osmocom.org/projects/libosmocore
9
 Standards-Version: 3.9.8
10
@@ -35,8 +35,8 @@
11
  libosmovty-doc deb doc optional arch=all
12
  libosmovty13 deb libs optional arch=any
13
 Checksums-Sha1:
14
- 1745f8b7965bc5ae3ae95b2b5dbe65c669e38300 1113304 libosmocore_1.9.0.209.e0c63.tar.xz
15
+ 3cd31d26e6156c96079536bcdefa0e62614d6bb3 1112828 libosmocore_1.9.0.214.14405.tar.xz
16
 Checksums-Sha256:
17
- b13c3236493848cbf8592a19e6d919a3b4f5f099227975a538403469c6ad2bda 1113304 libosmocore_1.9.0.209.e0c63.tar.xz
18
+ 21374784f1641e0b97eff57170a7afbe65eae507f016d073458123b169f7140c 1112828 libosmocore_1.9.0.214.14405.tar.xz
19
 Files:
20
- 4750e44ca75e804e50b1d4a1349c66c8 1113304 libosmocore_1.9.0.209.e0c63.tar.xz
21
+ 84ef3da50e9497084f2456361e0a2fdb 1112828 libosmocore_1.9.0.214.14405.tar.xz
22
libosmocore_1.9.0.209.e0c63.tar.xz/.tarball-version -> libosmocore_1.9.0.214.14405.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-1.9.0.209-e0c63
3
+1.9.0.214-14405
4
libosmocore_1.9.0.209.e0c63.tar.xz/debian/changelog -> libosmocore_1.9.0.214.14405.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-libosmocore (1.9.0.209.e0c63) unstable; urgency=medium
3
+libosmocore (1.9.0.214.14405) unstable; urgency=medium
4
 
5
   * Automatically generated changelog entry for building the Osmocom master feed
6
 
7
- -- Osmocom OBS scripts <info@osmocom.org>  Tue, 18 Jun 2024 17:09:56 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Wed, 24 Jul 2024 10:52:18 +0000
9
 
10
 libosmocore (1.9.0) unstable; urgency=medium
11
 
12
libosmocore_1.9.0.209.e0c63.tar.xz/osmo-release.mk -> libosmocore_1.9.0.214.14405.tar.xz/osmo-release.mk Changed
12
 
1
@@ -1,9 +1,2 @@
2
-ifndef REL
3
-   REL := patch
4
-endif
5
-
6
 release:
7
-ifeq ($(origin REL), file)
8
-   @echo "No REL value specified, defaulting to 'patch' release"
9
-endif
10
-   @osmo-release.sh $(VERSION) $(REL)
11
+   @PATH="$$PWD:$$PATH" osmo-release.sh $(VERSION) $(REL)
12
libosmocore_1.9.0.209.e0c63.tar.xz/osmo-release.sh -> libosmocore_1.9.0.214.14405.tar.xz/osmo-release.sh Changed
201
 
1
@@ -3,8 +3,17 @@
2
 REL=$2
3
 
4
 if  "z$REL" = "z" ; then
5
-   echo "No REL value specified, defaulting to 'patch' release"
6
-   REL="patch"
7
+   echo "usage: make REL=patch|minor|major release"
8
+   echo
9
+   echo "optional environment variables:"
10
+   echo "  DRY_RUN=1                        run checks but make no modifications"
11
+   echo "  ALLOW_NO_LIBVERSION_CHANGE=1     skip LIBVERSION in Makefile.am fchecks"
12
+   echo "  ALLOW_NO_LIBVERSION_DEB_MATCH=1  skip LIBVERSION in debian packaging checks"
13
+   echo "  ALLOW_NO_LIBVERSION_RPM_MATCH=1  skip LIBVERSION in rpm packaging checks"
14
+   echo
15
+   echo "See also:"
16
+   echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release"
17
+   exit 1
18
 fi
19
 
20
 ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}"
21
@@ -13,6 +22,23 @@
22
 # Test stuff but don't modify stuff:
23
 DRY_RUN="${DRY_RUN:-0}"
24
 
25
+RESET="\0331;0m"
26
+RED="\0331;31m"
27
+GREEN="\0331;32m"
28
+YELLOW="\0331;33m"
29
+
30
+ok() {
31
+   echo "${GREEN}OK:${RESET} $@"
32
+}
33
+
34
+warn() {
35
+   echo "${YELLOW}WARN:${RESET} $@"
36
+}
37
+
38
+error() {
39
+   echo "${RED}ERROR:${RESET} $@"
40
+}
41
+
42
 libversion_to_lib_major() {
43
    libversion="$1"
44
    current="$(echo "$libversion" | cut -d ":" -f 1)"
45
@@ -43,16 +69,16 @@
46
        if  "z$debctrl_match_count" != "z0" ; then
47
            #echo "Dependency <$dep, $ver> from configure.ac matched in debian/control! ($debctrl_match_count)"
48
            if  "z$debctrl_match_count" != "z1" ; then
49
-               echo "WARN: configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!"
50
+               warn "configure.ac <$dep, $ver> matches debian/control $debctrl_match_count times, manual check required!"
51
            else # 1 match:
52
                parsed_match=$(echo "$debctrl_match" | tr -d "(" | tr -d ")" | tr -d "," | tr -d " " | tr -d "\t" | sed "s/>=/ /g")
53
                debctrl_dep=$(echo "$parsed_match" | cut -d " " -f 1 | sed "s/-dev//g")
54
                debctrl_ver=$(echo "$parsed_match" | cut -d " " -f 2)
55
                if  "z$dep" != "z$debctrl_dep"  ||  "z$ver" != "z$debctrl_ver" ; then
56
-                   echo "ERROR: configure.ac <$dep, $ver> does NOT match debian/control <$debctrl_dep, $debctrl_ver>!"
57
+                   error "configure.ac <$dep, $ver> does NOT match debian/control <$debctrl_dep, $debctrl_ver>!"
58
                    return_error=1
59
                #else
60
-               #   echo "OK: configure.ac <$dep, $ver> matches debian/control <$debctrl_dep, $debctrl_ver>"
61
+               #   ok "configure.ac <$dep, $ver> matches debian/control <$debctrl_dep, $debctrl_ver>"
62
                fi
63
            fi
64
        fi
65
@@ -64,10 +90,10 @@
66
 
67
    # catch and forward exit from pipe subshell "while read":
68
    if  $? -ne 0 ; then
69
-       echo "ERROR: exiting due to previous errors"
70
+       error "exiting due to previous errors"
71
        exit 1
72
    fi
73
-   echo "OK: dependency specific versions in configure.ac and debian/control match"
74
+   ok "dependency specific versions in configure.ac and debian/control match"
75
 }
76
 
77
 # Make sure that depedency requirement versions match in configure.ac vs contrib/*.spec.in.
78
@@ -88,16 +114,16 @@
79
        if  "z$rpmspecin_match_count" != "z0" ; then
80
            #echo "Dependency <$dep, $ver> from configure.ac matched in contrib/*.spec.in! ($rpmspecin_match_count)"
81
            if  "z$rpmspecin_match_count" != "z1" ; then
82
-               echo "WARN: configure.ac <$dep, $ver> matches contrib/*.spec.in $rpmspecin_match_count times, manual check required!"
83
+               warn "configure.ac <$dep, $ver> matches contrib/*.spec.in $rpmspecin_match_count times, manual check required!"
84
            else # 1 match:
85
                parsed_match=$(echo "$rpmspecin_match" | tr -d "(" | tr -d ")" | tr -d ":" | tr -d " " | tr -d "\t" | sed "s/BuildRequires//g" | sed "s/pkgconfig//g" |sed "s/>=/ /g")
86
                rpmspecin_dep=$(echo "$parsed_match" | cut -d " " -f 1)
87
                rpmspecin_ver=$(echo "$parsed_match" | cut -d " " -f 2)
88
                if  "z$dep" != "z$rpmspecin_dep"  ||  "z$ver" != "z$rpmspecin_ver" ; then
89
-                   echo "ERROR: configure.ac <$dep, $ver> does NOT match contrib/*.spec.in <$rpmspecin_dep, $rpmspecin_ver>!"
90
+                   error "configure.ac <$dep, $ver> does NOT match contrib/*.spec.in <$rpmspecin_dep, $rpmspecin_ver>!"
91
                    return_error=1
92
                #else
93
-               #   echo "OK: configure.ac <$dep, $ver> matches contrib/*.spec.in <$debctrl_dep, $debctrl_ver>"
94
+               #   ok "configure.ac <$dep, $ver> matches contrib/*.spec.in <$debctrl_dep, $debctrl_ver>"
95
                fi
96
            fi
97
        fi
98
@@ -109,10 +135,10 @@
99
 
100
    # catch and forward exit from pipe subshell "while read":
101
    if  $? -ne 0 ; then
102
-       echo "ERROR: exiting due to previous errors"
103
+       error "exiting due to previous errors"
104
        exit 1
105
    fi
106
-   echo "OK: dependency specific versions in configure.ac and contrib/*.spec.in match"
107
+   ok "dependency specific versions in configure.ac and contrib/*.spec.in match"
108
 }
109
 
110
 # Make sure that patches under debian/patches/ apply:
111
@@ -123,10 +149,10 @@
112
    for patch in ${GIT_TOPDIR}/debian/patches/*.patch; do
113
        git apply --check $patch
114
        if  $? -ne 0 ; then
115
-           echo "ERROR: patch no longer applies! $patch"
116
+           error "patch no longer applies! $patch"
117
            exit 1
118
        else
119
-           echo "OK: patch applies: $patch"
120
+           ok "patch applies: $patch"
121
        fi
122
    done
123
 }
124
@@ -137,34 +163,34 @@
125
        major="$(libversion_to_lib_major "$libversion")"
126
        file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)"
127
        if  "z$file_matches" = "z0" ; then
128
-           echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion"
129
+           error "Found no matching debian/lib*$major.install file for LIBVERSION=$libversion"
130
            exit 1
131
        elif  "z$file_matches" = "z1" ; then
132
-           echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion"
133
+           ok "Found matching debian/lib*$major.install for LIBVERSION=$libversion"
134
        else
135
-           echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!"
136
+           warn "Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!"
137
        fi
138
 
139
        control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)"
140
        if  "z$control_matches" = "z0" ; then
141
-           echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion"
142
+           error "Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion"
143
            exit 1
144
        elif  "z$control_matches" = "z1" ; then
145
-           echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion"
146
+           ok "Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion"
147
        else
148
-           echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!"
149
+           warn "Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!"
150
        fi
151
 
152
        dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)"
153
        dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)"
154
        if  "z$dhstrip_lib_total" != "z0" ; then
155
            if  "z$dhstrip_lib_matches" = "z0"  ; then
156
-               echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion"
157
+               error "Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion"
158
                exit 1
159
            elif  "z$dhstrip_lib_total" = "z1" ; then
160
-               echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion"
161
+               ok "Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion"
162
            else
163
-               echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!"
164
+               warn "Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!"
165
            fi
166
        fi
167
    done
168
@@ -187,22 +213,22 @@
169
 
170
        control_matches="$(grep -e "%files" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "lib" | grep "$major$" | wc -l)"
171
        if  "z$control_matches" = "z0" ; then
172
-           echo "ERROR: Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"
173
+           error "Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"
174
            exit 1
175
        elif  "z$control_matches" = "z1" ; then
176
-           echo "OK: Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"
177
+           ok "Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"
178
        else
179
-           echo "WARN: Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"
180
+           warn "Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"
181
        fi
182
 
183
        control_matches="$(grep -e "_libdir" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "/lib" | grep "so.$major" | wc -l)"
184
        if  "z$control_matches" = "z0" ; then
185
-           echo "ERROR: Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"
186
+           error "Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"
187
            exit 1
188
        elif  "z$control_matches" = "z1" ; then
189
-           echo "OK: Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"
190
+           ok "Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"
191
        else
192
-           echo "WARN: Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"
193
+           warn "Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"
194
        fi
195
    done
196
    # catch and forward exit from pipe subshell "while read":
197
@@ -211,6 +237,20 @@
198
    fi
199
 }
200
 
201