New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

packaging: sync spec file with Fedora package #608

Closed
wants to merge 2 commits into
base: master
from

Conversation

Projects
None yet
3 participants
@praiskup
Member

praiskup commented Jul 22, 2016

Fedora maintainers have done big cleanup and simplification so it
is worth to sync the spec file here.

Also, as it is now suggested to build from github release tarball,
which is not 100% perfect, this commit fixes the 'srpmgen' tool so
it is able to generate equivalent tarball directly from git repo.

@praiskup praiskup force-pushed the praiskup:fedora-packaging-2016-07-22 branch from 0d8cbe5 to f34e45e Jul 23, 2016

@vlsi vlsi added this to the 9.4.1210 milestone Aug 7, 2016

@vlsi

This comment has been minimized.

Member

vlsi commented Aug 18, 2016

Just in case: https://travis-ci.org/pgjdbc/pgjdbc/jobs/153235670

copr build failed trying to download http://pgjdbc-rel9.5.git.tar.gz/

 * getting sources pgjdbc-REL9.5.git.tar.gz
--2016-08-18 11:02:23--  http://pgjdbc-rel9.5.git.tar.gz/
Resolving pgjdbc-rel9.5.git.tar.gz (pgjdbc-rel9.5.git.tar.gz)... failed: Name or service not known.
wget: unable to resolve host address 'pgjdbc-rel9.5.git.tar.gz'
can't wget pgjdbc-REL9.5.git.tar.gz at /usr/bin/srpmgen line 64, <$config_file> line 10.
The command "./.travis/travis_build.sh" exited with 2.
@praiskup

This comment has been minimized.

Member

praiskup commented Aug 19, 2016

Hi @vlsi, as I changed some scripts, I've changed the docker image too (and I probably forgot
to push the image to dockerhub). Can you re-submit the testsuite now please?

@vlsi

This comment has been minimized.

Member

vlsi commented Aug 19, 2016

Thanks for looking into this.
Here's Travis link: https://travis-ci.org/pgjdbc/pgjdbc/builds/153495206
There's a queue for pgjdbc, so fedora_build branch might wait like an hour in the build queue.

@vlsi

This comment has been minimized.

Member

vlsi commented Aug 19, 2016

@praiskup ,

As far as I can understand, the problem is

source0:
  git_archive:
    prefix: pgjdbc-REL9.5.git
    tarball_base: REL9.5.git

It basically makes git archive into REL9.5.git.tar.gz, and later tries to check pgjdbc-REL9.5.git.tar.gz file for accessibility. That file is obviously not there, so it tries to wget the file and it fails.

I think here's the fix: 742622d, however it looks like you need to integrate that into the docker image so it would be available to Travis.

@vlsi

This comment has been minimized.

Member

vlsi commented Aug 19, 2016

@praiskup , I've noticed that "license" is marked as "BSD and ASL 2.0"

https://github.com/pgjdbc/pgjdbc/blob/master/packaging/rpm/postgresql-jdbc.spec.tpl#L50-L51

I don't think we have Apache 2.0 bits in the final build.
We do use ASL2 tools during compile time, however we don't ship ASL2 bits.

The commen "ASL 2.0 applies only to postgresql-jdbc.pom file" looks weird.

@vlsi vlsi force-pushed the pgjdbc:master branch from 6a79b36 to a639431 Aug 28, 2016

@vlsi

This comment has been minimized.

Member

vlsi commented Aug 28, 2016

@praiskup , just in case: copr build still fails.

@praiskup

This comment has been minimized.

Member

praiskup commented Aug 29, 2016

@vlsi sorry for long delay, I'll have a look asap

@praiskup

This comment has been minimized.

Member

praiskup commented Aug 29, 2016

praiskup and others added some commits Jul 22, 2016

packaging: sync spec file with Fedora package
Fedora maintainers have done big cleanup and simplification so it
is worth syncing the spec file with pgjdbc.

Also, this commit fixes the 'srpmgen' tool so it is able to
generate equivalent tarball to github's release tarball.

@praiskup praiskup force-pushed the praiskup:fedora-packaging-2016-07-22 branch from f34e45e to 3a25af0 Aug 29, 2016

@praiskup

This comment has been minimized.

Member

praiskup commented Aug 29, 2016

@vlsi, the issue with tarball was that I haven't updated the Source tag in spec file according
to the format provided by github, iow: I used psqlodbc-REL* instead of REL*.

@codecov-io

This comment has been minimized.

codecov-io commented Aug 29, 2016

Current coverage is 61.96% (diff: 100%)

Merging #608 into master will increase coverage by 0.01%

@@             master       #608   diff @@
==========================================
  Files           150        150          
  Lines         15154      15154          
  Methods           0          0          
  Messages          0          0          
  Branches       3049       3049          
==========================================
+ Hits           9387       9390     +3   
+ Misses         4516       4515     -1   
+ Partials       1251       1249     -2   

Powered by Codecov. Last update 2d9b313...3a25af0

@vlsi

This comment has been minimized.

Member

vlsi commented Aug 29, 2016

@praiskup

This comment has been minimized.

Member

praiskup commented Aug 29, 2016

:) right, that's expected after psqlodbc-REL* to REL* change.

@vlsi vlsi closed this in dd48911 Aug 30, 2016

zemian pushed a commit to zemian/pgjdbc that referenced this pull request Oct 6, 2016

packaging: sync spec file with Fedora package
Fedora maintainers have done big cleanup and simplification so it
is worth syncing the spec file with pgjdbc.

Also, this commit fixes the 'srpmgen' tool so it is able to
generate equivalent tarball to github's release tarball.

fixes pgjdbc#608
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment