Skip to content

Commit 8bc2b85

Browse files
Merge pull request #758 from g-maxime/fix-after-23.06
Clean and fix linux project files
2 parents 21a916b + 74c7916 commit 8bc2b85

35 files changed

+73
-926
lines changed

Project/GNU/mediaconch.dsc

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@ Homepage: http://MediaArea.net/MediaConch
88
Standards-Version: 3.9.6
99
Vcs-Git: https://github.com/MediaArea/MediaConch_SourceCode.git
1010
Vcs-Browser: https://github.com/MediaArea/MediaConch_SourceCode
11-
Build-Depends: debhelper (>= 9), dh-autoreconf, tofrodos, libmediainfo-dev (>= 23.07), libzen-dev (>= 0.4.41), qt5-qmake, qtbase5-dev, libqt5webkit5-dev, libxml2-dev, libxslt-dev, libsqlite3-dev, libjansson-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool, libcurl4-gnutls-dev, libevent-dev
11+
Build-Depends: debhelper (>= 9), dh-autoreconf, tofrodos, libmediainfo-dev (>= 23.07), libzen-dev (>= 0.4.41), qt5-qmake, qtbase5-dev, libqt5webkit5-dev, libxml2-dev, libxslt-dev, libsqlite3-dev, libjansson-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool, libcurl4-gnutls-dev, libevent-dev, python3-all, dh-python
1212
Package-List:
1313
mediaconch deb utils optional arch=any
1414
mediaconch-server deb utils optional arch=any
1515
mediaconch-gui deb utils optional arch=any
16+
libmediaconch0 deb libs optional arch=any
17+
libmediaconch-dev deb libdevel optional arch=any
1618
mediaconch-dbg deb debug extra arch=any
1719
mediaconch-server-dbg debug utils extra arch=any
1820
mediaconch-gui-dbg deb debug extra arch=any
21+
libmediaconch0-dbg deb debug extra arch=any
1922
Checksums-Sha1:
2023
0000000000000000000000000000000000000000 000000 mediaconch_23.07.orig.tar.xz
2124
0000000000000000000000000000000000000000 000000 mediaconch_23.07-1.debian.tar.xz

Project/GNU/mediaconch.spec

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%global libmediainfo_version 23.07
33
%global libzen_version 0.4.41
44

5-
%if 0%{?fedora_version} || 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600
5+
%if 0%{?fedora_version} || 0%{?rhel}
66
%global libmediaconch_name libmediaconch
77
%global libmediainfo_name libmediainfo
88
%global libzen_name libzen
@@ -13,7 +13,7 @@
1313
%endif
1414

1515
# CentOS also set rhel macro
16-
%if ! 0%{?suse_version} && ! 0%{?rhel} || 0%{?suse_version} >= 1200 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700
16+
%if ! 0%{?suse_version} || 0%{?suse_version} >= 1200
1717
%global build_server 1
1818
%else
1919
%global build_server 0
@@ -378,7 +378,7 @@ fi
378378
%files
379379
%defattr(-,root,root,-)
380380
%doc Release/ReadMe_CLI_Linux.txt History_CLI.txt
381-
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
381+
%if 0%{?fedora_version} || 0%{?rhel}
382382
%license License.html
383383
%else
384384
%doc License.html
@@ -389,7 +389,7 @@ fi
389389
%files server
390390
%defattr(-,root,root,-)
391391
%doc Documentation/Daemon.md Documentation/Config.md Documentation/REST.md
392-
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
392+
%if 0%{?fedora_version} || 0%{?rhel}
393393
%license License.html
394394
%else
395395
%doc License.html
@@ -417,7 +417,7 @@ fi
417417
%files gui
418418
%defattr(-,root,root,-)
419419
%doc Release/ReadMe_GUI_Linux.txt History_GUI.txt
420-
%if 0%{?fedora_version} || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700
420+
%if 0%{?fedora_version} || 0%{?rhel}
421421
%license License.html
422422
%else
423423
%doc License.html

Project/OBS/deb7.debian/changelog

-6
This file was deleted.

Project/OBS/deb7.debian/compat

-1
This file was deleted.

Project/OBS/deb7.debian/control

-118
This file was deleted.

Project/OBS/deb7.debian/copyright

-19
This file was deleted.

Project/OBS/deb7.debian/mediaconch-gui.dirs

-9
This file was deleted.

Project/OBS/deb7.debian/mediaconch-gui.install

-9
This file was deleted.

Project/OBS/deb7.debian/mediaconch-server.dirs

-1
This file was deleted.

Project/OBS/deb7.debian/mediaconch-server.install

-1
This file was deleted.

Project/OBS/deb7.debian/mediaconch.dirs

-2
This file was deleted.

Project/OBS/deb7.debian/mediaconch.install

-2
This file was deleted.

Project/OBS/deb7.debian/rules

-134
This file was deleted.

Project/OBS/deb7.debian/source/format

-1
This file was deleted.

0 commit comments

Comments
 (0)