Commit a95bf8d74fc804ca49cc749d9ad8909da998c1c4
1 parent
0612eb2c
Exists in
master
and in
3 other branches
Updating package control files.
Showing
5 changed files
with
9 additions
and
8 deletions
Show diff stats
arch/PKGBUILD
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | pkgname=lib3270 | 3 | pkgname=lib3270 |
4 | 4 | ||
5 | pkgver=5.3 | 5 | pkgver=5.3 |
6 | -pkgrel=2 | 6 | +pkgrel=0 |
7 | pkgdesc="TN3270 Access library" | 7 | pkgdesc="TN3270 Access library" |
8 | url="https://github.com/PerryWerneck/lib3270/" | 8 | url="https://github.com/PerryWerneck/lib3270/" |
9 | arch=(i686 x86_64) | 9 | arch=(i686 x86_64) |
debian/changelog
debian/rules
@@ -61,8 +61,6 @@ install: build | @@ -61,8 +61,6 @@ install: build | ||
61 | 61 | ||
62 | # Install dev | 62 | # Install dev |
63 | make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev install-dev | 63 | make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev install-dev |
64 | - mkdir -p $(PWD)/debian/$(PACKAGE_NAME)-dev/usr/lib | ||
65 | - mv $(PWD)/debian/$(PACKAGE_NAME)/usr/lib/*.so $(PWD)/debian/$(PACKAGE_NAME)-dev/usr/lib | ||
66 | 64 | ||
67 | # --- end custom part for installing | 65 | # --- end custom part for installing |
68 | 66 |
rpm/_service
@@ -5,15 +5,17 @@ | @@ -5,15 +5,17 @@ | ||
5 | <param name="changesgenerate">enable</param> | 5 | <param name="changesgenerate">enable</param> |
6 | <param name="changesauthor">perry.werneck@gmail.com</param> | 6 | <param name="changesauthor">perry.werneck@gmail.com</param> |
7 | <param name="url">https://github.com/PerryWerneck/lib3270.git</param> | 7 | <param name="url">https://github.com/PerryWerneck/lib3270.git</param> |
8 | - <param name="versionformat">@PARENT_TAG@</param> | 8 | + <param name="versionformat">@PARENT_TAG@+git%cd</param> |
9 | <param name="scm">git</param> | 9 | <param name="scm">git</param> |
10 | </service> | 10 | </service> |
11 | 11 | ||
12 | <!-- https://github.com/openSUSE/obs-service-extract_file --> | 12 | <!-- https://github.com/openSUSE/obs-service-extract_file --> |
13 | - <!-- service name="extract_file"> | 13 | + |
14 | + <!-- | ||
15 | + <service name="extract_file"> | ||
14 | <param name="archive">*.tar</param> | 16 | <param name="archive">*.tar</param> |
15 | <param name="files">*/rpm/lib3270.spec</param> | 17 | <param name="files">*/rpm/lib3270.spec</param> |
16 | - </service --> | 18 | + </service> |
17 | 19 | ||
18 | <service name="extract_file"> | 20 | <service name="extract_file"> |
19 | <param name="archive">*.tar</param> | 21 | <param name="archive">*.tar</param> |
@@ -66,6 +68,7 @@ | @@ -66,6 +68,7 @@ | ||
66 | <param name="files">*/debian/postrm</param> | 68 | <param name="files">*/debian/postrm</param> |
67 | <param name="outfilename">debian.postrm</param> | 69 | <param name="outfilename">debian.postrm</param> |
68 | </service> | 70 | </service> |
71 | + --> | ||
69 | 72 | ||
70 | <service name="recompress"> | 73 | <service name="recompress"> |
71 | <param name="file">*.tar</param> | 74 | <param name="file">*.tar</param> |
rpm/lib3270.spec
@@ -50,7 +50,7 @@ TN3270 access library, originally designed as part of the pw3270 application. | @@ -50,7 +50,7 @@ TN3270 access library, originally designed as part of the pw3270 application. | ||
50 | For more details, see https://softwarepublico.gov.br/social/pw3270/ . | 50 | For more details, see https://softwarepublico.gov.br/social/pw3270/ . |
51 | 51 | ||
52 | %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) | 52 | %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) |
53 | -%define MINOR_VERSION %(echo %{version} | cut -d. -f2) | 53 | +%define MINOR_VERSION %(echo %{version} | cut -d. -f2 | cut -d+ -f1) |
54 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} | 54 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} |
55 | 55 | ||
56 | %package -n %{name}-%{_libvrs} | 56 | %package -n %{name}-%{_libvrs} |