Skip to content

Commit ea8d1ad

Browse files
danielhamsdanielhams
authored
Merge pull request #137 from sgidevnet/wipnonautomated
Release 0.0.6 - Fixes discovered during world build #1
2 parents e16bc7b + 0b7a46e commit ea8d1ad

File tree

6 files changed

+185
-6
lines changed

6 files changed

+185
-6
lines changed

‎packages/docbook5-style-xsl/SPECS/docbook5-style-xsl.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
Name: docbook5-style-xsl
55
Version: 1.79.2
6-
Release: 8%{?dist}
6+
Release: 9%{?dist}
77

88
Summary: Norman Walsh's XSL stylesheets for DocBook 5.X
99

@@ -74,6 +74,9 @@ rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-ns-stylesheets/install.sh
7474
perl -pi -e "s|/bin/bash|%{_bindir}/bash|g" $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%version/tools/bin/docbook-xsl-update
7575
perl -pi -e "s|/usr/bin/perl|%{_bindir}/perl|g" $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%version/fo/pdf2index
7676

77+
# And remove a script that uses ruby we don't currently have
78+
rm -f $RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xsl-ns-stylesheets-%version/epub/bin/dbtoepub
79+
7780
%files
7881
%doc BUGS
7982
%doc README COPYING
@@ -123,6 +126,9 @@ if [ "$1" = 0 ]; then
123126
fi
124127

125128
%changelog
129+
* Thu Jul 30 2020 Daniel Hams <[email protected]> - 1.79.2-9
130+
- Remove epub translator that attempts to use ruby (we don''t have it yet)
131+
126132
* Wed Jul 24 2019 Fedora Release Engineering <[email protected]> - 1.79.2-8
127133
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
128134

‎packages/gobject-introspection/SPECS/gobject-introspection.spec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Name: gobject-introspection
66
Version: 1.62.0
7-
Release: 7%{?dist}
7+
Release: 8%{?dist}
88
Summary: Introspection system for GObject-based libraries
99

1010
License: GPLv2+, LGPLv2+, MIT
@@ -65,6 +65,8 @@ perl -pi -e "s|/bin/sh|%{_bindir}/sh|g" giscanner/dumper.py
6565

6666
%build
6767
export LD_LIBRARYN32_PATH=%{_builddir}/gobject-introspection-1.62.0/mips-sgug-irix/girepository/:$LD_LIBRARYN32_PATH
68+
export CC=mips-sgi-irix6.5-gcc
69+
export CXX=mips-sgi-irix6.5-g++
6870

6971
%meson -Ddoctool=true -Dgtk_doc=false -Dpython=%{__python3}
7072
%meson_build
@@ -93,6 +95,9 @@ export LD_LIBRARYN32_PATH=%{_builddir}/gobject-introspection-1.62.0/mips-sgug-ir
9395
#%%{_datadir}/gtk-doc/html/gi/
9496

9597
%changelog
98+
* Thu Jul 30 2020 Daniel Hams <[email protected]> - 1.62.0-8
99+
- Be explicit about which compilers to use
100+
96101
* Sat Jun 20 2020 Daniel Hams <[email protected]> - 1.62.0-7
97102
- Fix some hardcoded paths + reenable deps now we have packaged enough python pieces
98103

‎packages/pax-utils/SPECS/pax-utils.spec‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
Summary: ELF utils that can check files for security relevant properties
77
Name: pax-utils
88
Version: 1.2.4
9-
Release: 7%{?dist}
9+
Release: 8%{?dist}
1010
# http://packages.gentoo.org/package/app-misc/pax-utils
1111
URL: https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities
1212
Source0: https://distfiles.gentoo.org/distfiles/%{name}-%{version}.tar.xz
13-
Patch0: paxutils.sgifixups.patch
13+
1414
License: GPLv2
1515
BuildRequires: gcc
1616
#BuildRequires: libcap-devel
@@ -34,7 +34,7 @@ PaX helpers for people interested in that.
3434

3535
%prep
3636
%setup -q
37-
%patch0 -p1 -b .sgifixups
37+
3838
sed -i -e 's|#!/usr/bin/python.*|#!%{_bindir}/python3|' lddtree.py
3939

4040
%build
@@ -75,6 +75,9 @@ make check
7575
#%{_mandir}/man1/scanmacho.1*
7676

7777
%changelog
78+
* Thu Jul 30 2020 Daniel Hams <[email protected]> - 1.2.4-8
79+
- No longer need the patch as paths auto-fixed by rpm
80+
7881
* Fri Apr 10 2020 Daniel Hams <[email protected]> - 1.2.4-7
7982
- Remove hard coded shell paths
8083

‎packages/ranger/SPECS/ranger.spec‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
Name: ranger
2+
Version: 1.9.2
3+
Release: 4%{?dist}
4+
Summary: A vim-like file manager
5+
License: GPLv3+
6+
URL: https://ranger.github.io/
7+
Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
8+
9+
BuildArch: noarch
10+
BuildRequires: desktop-file-utils
11+
BuildRequires: python3-devel
12+
BuildRequires: python3-setuptools
13+
#Suggests: w3m-img
14+
15+
%description
16+
Ranger is a free console file manager that gives you greater flexibility and a
17+
good overview of your files without having to leave your *nix console. It
18+
visualizes the directory tree in two dimensions: the directory hierarchy on
19+
one, lists of files on the other, with a preview to the right so you know where
20+
you'll be going.
21+
22+
23+
%prep
24+
%autosetup
25+
sed -i -e '1d;2i#!/usr/bin/python3' %{name}.py
26+
27+
28+
%build
29+
%py3_build
30+
31+
32+
%install
33+
%py3_install
34+
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
35+
mv %{buildroot}%{_pkgdocdir} _doc
36+
find _doc -type f -exec chmod -R -x '{}' \;
37+
38+
39+
%files
40+
%license LICENSE
41+
%doc _doc/*
42+
%{_bindir}/ranger
43+
%{_bindir}/rifle
44+
%{python3_sitelib}/*
45+
%{_datadir}/applications/ranger.desktop
46+
%{_mandir}/man1/ranger.1*
47+
%{_mandir}/man1/rifle.1*
48+
49+
50+
%changelog
51+
* Fri Jul 26 2019 Fedora Release Engineering <[email protected]> - 1.9.2-4
52+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
53+
54+
* Sat Feb 02 2019 Fedora Release Engineering <[email protected]> - 1.9.2-3
55+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
56+
57+
* Sun Oct 21 2018 Filipe Rosset <[email protected]> - 1.9.2-2
58+
- spec modernization thanks to Filip Szymański <[email protected]>
59+
- fixes rhbz #1592733 #1408563 #1495481 and #1559823
60+
61+
* Sun Oct 21 2018 Filipe Rosset <[email protected]> - 1.9.2-1
62+
- update to latest version + spec cleanup, fixes rhbz #1408563
63+
64+
* Sat Jul 14 2018 Fedora Release Engineering <[email protected]> - 1.7.2-10
65+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
66+
67+
* Tue Jun 19 2018 Miro Hrončok <[email protected]> - 1.7.2-9
68+
- Rebuilt for Python 3.7
69+
70+
* Fri Feb 09 2018 Fedora Release Engineering <[email protected]> - 1.7.2-8
71+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
72+
73+
* Thu Jul 27 2017 Fedora Release Engineering <[email protected]> - 1.7.2-7
74+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
75+
76+
* Sat Feb 11 2017 Fedora Release Engineering <[email protected]> - 1.7.2-6
77+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
78+
79+
* Mon Dec 19 2016 Miro Hrončok <[email protected]> - 1.7.2-5
80+
- Rebuild for Python 3.6
81+
82+
* Tue Jul 19 2016 Fedora Release Engineering <[email protected]> - 1.7.2-4
83+
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
84+
85+
* Thu Feb 04 2016 Fedora Release Engineering <[email protected]> - 1.7.2-3
86+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
87+
88+
* Tue Nov 10 2015 Fedora Release Engineering <[email protected]> - 1.7.2-2
89+
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
90+
91+
* Tue Oct 13 2015 Ben Boeckel <[email protected]> - 1.7.2-1
92+
- update to 1.7.2
93+
94+
* Wed Sep 30 2015 Ben Boeckel <[email protected]> - 1.7.1-3
95+
- run find on the right directory
96+
97+
* Tue Sep 29 2015 Ben Boeckel <[email protected]> - 1.7.1-2
98+
- remove executable bits from docs
99+
- remove defattr line
100+
101+
* Sat Sep 26 2015 Ben Boeckel <[email protected]> - 1.7.1-1
102+
- update to 1.7.1
103+
104+
* Thu Sep 10 2015 Ben Boeckel <[email protected]> - 1.6.1-7
105+
- use python3
106+
107+
* Thu Jun 18 2015 Fedora Release Engineering <[email protected]> - 1.6.1-6
108+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
109+
110+
* Mon Mar 02 2015 Ben Boeckel <[email protected]> - 1.6.1-5
111+
- fix mupdf binary name (rhbz#1186823)
112+
113+
* Sat Dec 13 2014 Ben Boeckel <[email protected]> - 1.6.1-4
114+
- Fix the right file (was the source file, but upstream regenerates the
115+
installed file manually).
116+
117+
* Thu Dec 11 2014 Ben Boeckel <[email protected]> - 1.6.1-3
118+
- Fix documentation typo
119+
120+
* Sun Jun 08 2014 Fedora Release Engineering <[email protected]> - 1.6.1-2
121+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
122+
123+
* Sun Sep 29 2013 Remi Collet <[email protected]> - 1.6.1-1
124+
- Update to 1.6.1
125+
- add rifle command
126+
127+
* Sun Aug 04 2013 Fedora Release Engineering <[email protected]> - 1.4.2-3
128+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
129+
130+
* Thu Feb 14 2013 Fedora Release Engineering <[email protected]> - 1.4.2-2
131+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
132+
133+
* Sun Nov 04 2012 Ben Boeckel <[email protected]> - 1.4.2-1
134+
- Update to 1.4.2
135+
136+
* Sat Jul 21 2012 Fedora Release Engineering <[email protected]> - 1.2.2-4
137+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
138+
139+
* Sat Jan 14 2012 Fedora Release Engineering <[email protected]> - 1.2.2-3
140+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
141+
142+
* Wed Feb 09 2011 Fedora Release Engineering <[email protected]> - 1.2.2-2
143+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
144+
145+
* Tue Oct 19 2010 Ben Boeckel <[email protected]> - 1.2.2-1
146+
- Update to 1.2.2
147+
148+
* Sat Jul 24 2010 Ben Boeckel <[email protected]> - 1.1.2-2
149+
- Add patch to remove shebang line
150+
- BR python2-devel
151+
152+
* Fri Jul 23 2010 Ben Boeckel <[email protected]> - 1.1.2-1
153+
- Initial package

‎packages/rpm/SPECS/rpm.spec‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
%global rpmver 4.15.0
2323
#global snapver rc1
24-
%global rel 15
24+
%global rel 16
2525

2626
%global srcver %{version}%{?snapver:-%{snapver}}
2727
%global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
@@ -349,6 +349,14 @@ perl -pi -e "s|/usr/bin/sh|%{_prefix}/bin/sh|g" mkinstalldirs
349349
perl -pi -e "s|/bin/bash|%{_prefix}/bin/bash|g" scripts/pkgconfigdeps.sh
350350
perl -pi -e "s|/usr/bin/pkg-config|%{_prefix}/bin/pkg-config|g" scripts/pkgconfigdeps.sh
351351

352+
# Rewrite some /usr/bin/env bash usages that aren''t fixed by macros (yet)
353+
perl -pi -e "s|/usr/bin/env bash|%{_prefix}/bin/bash|g" scripts/check-prereqs
354+
perl -pi -e "s|/usr/bin/env bash|%{_prefix}/bin/bash|g" scripts/check-rpaths-worker
355+
perl -pi -e "s|/usr/bin/env bash|%{_prefix}/bin/bash|g" scripts/find-lang.sh
356+
perl -pi -e "s|/usr/bin/env bash|%{_prefix}/bin/bash|g" scripts/fontconfig.prov
357+
perl -pi -e "s|/usr/bin/env bash|%{_prefix}/bin/bash|g" scripts/rpmdb_loadcvt
358+
perl -pi -e "s|/usr/bin/env bash|%{_prefix}/bin/bash|g" scripts/find-debuginfo.sh
359+
352360
%if %{with int_bdb}
353361
ln -s db-%{bdbver} db
354362
%endif
@@ -601,6 +609,9 @@ make check || (cat tests/rpmtests.log; exit 0)
601609
%doc doc/librpm/html/*
602610

603611
%changelog
612+
* Thu Jul 30 2020 Daniel Hams <[email protected]> - 4.15.0-16
613+
- Rewrite some /usr/bin/env paths that aren''t fixed by macros (yet)
614+
604615
* Mon Jun 18 2020 Daniel Hams <[email protected]> - 4.15.0-15
605616
- Depend on newer libdicl
606617

‎releasepackages.lst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ uuid
318318
vim
319319
wget
320320
which
321+
worker
321322
xcb-proto
322323
xhtml1-dtds
323324
xhtml2fo-style-xsl

0 commit comments

Comments
 (0)