Skip to content

Commit fd3e33f

Browse files
committed
try 3.1.5
1 parent 701548a commit fd3e33f

File tree

4 files changed

+191
-127
lines changed

4 files changed

+191
-127
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- tdnf-3.1.5-orig/tools/cli/lib/output.c 2021-10-06 18:39:26.000000000 +0000
2+
+++ tdnf-3.1.5/tools/cli/lib/output.c 2021-11-17 21:14:29.710175680 +0000
3+
@@ -20,6 +20,7 @@
4+
*/
5+
6+
#include "includes.h"
7+
+#include <sys/termios.h>
8+
9+
void
10+
ShowConsoleProps(

packages/tdnf/SOURCES/client-defines.sgifixes.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- tdnf-3.0.0-beta-orig/client/defines.h 2020-10-27 01:14:06.000000000 +0000
2-
+++ tdnf-3.0.0/client/defines.h 2020-12-19 20:43:27.407203760 +0000
1+
--- tdnf-3.1.5-orig/client/defines.h 2021-10-06 18:39:26.000000000 +0000
2+
+++ tdnf-3.1.5/client/defines.h 2021-11-17 20:39:21.042920320 +0000
33
@@ -59,7 +59,7 @@
44

55
//Repo defines
@@ -9,10 +9,10 @@
99
#define TDNF_CONF_GROUP "main"
1010
//Conf file key names
1111
#define TDNF_CONF_KEY_GPGCHECK "gpgcheck"
12-
@@ -103,10 +103,10 @@
13-
#define TDNF_REPO_METALINK_FILE_NAME "metalink"
12+
@@ -110,10 +110,10 @@
1413
#define TDNF_REPO_BASEURL_FILE_NAME "baseurl"
15-
//Repo defaults
14+
15+
// repo defaults
1616
-#define TDNF_DEFAULT_REPO_LOCATION "/etc/yum.repos.d"
1717
-#define TDNF_DEFAULT_CACHE_LOCATION "/var/cache/tdnf"
1818
-#define TDNF_DEFAULT_DISTROVERPKG "system-release"
@@ -24,7 +24,7 @@
2424
#define TDNF_RPM_CACHE_DIR_NAME "rpms"
2525
#define TDNF_REPODATA_DIR_NAME "repodata"
2626
#define TDNF_SOLVCACHE_DIR_NAME "solvcache"
27-
@@ -121,7 +121,7 @@
27+
@@ -140,7 +140,7 @@
2828
/* plugin defines */
2929
#define TDNF_DEFAULT_PLUGINS_ENABLED 0
3030
#define TDNF_DEFAULT_PLUGIN_PATH SYSTEM_LIBDIR"/tdnf-plugins"
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
--- tdnf-3.0.0-beta-orig/CMakeLists.txt 2020-12-03 17:02:43.241228240 +0000
2-
+++ tdnf-3.0.0-beta/CMakeLists.txt 2020-12-03 17:03:26.043551840 +0000
3-
@@ -29,11 +29,11 @@
1+
--- tdnf-3.1.5-orig/CMakeLists.txt 2021-10-06 18:39:26.000000000 +0000
2+
+++ tdnf-3.1.5/CMakeLists.txt 2021-11-17 20:33:17.954842960 +0000
3+
@@ -29,13 +29,13 @@
44
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
55

66
# Ensure that we don't accidentally install into /usr/etc
77
-set(CMAKE_INSTALL_FULL_SYSCONDIR "/etc")
88
-set(SYSCONFDIR /etc)
9+
-
10+
-set(MOTGEN_DIR /etc/motdgen.d)
911
+set(CMAKE_INSTALL_FULL_SYSCONDIR "/usr/sgug/etc")
1012
+set(SYSCONFDIR /usr/sgug/etc)
1113

12-
-set(MOTGEN_DIR /etc/motdgen.d)
13-
-set(SYSTEMD_DIR /lib/systemd/system)
1414
+set(MOTGEN_DIR /usr/sgug/etc/motdgen.d)
15-
+set(SYSTEMD_DIR /usr/sgug/lib/systemd/system)
16-
17-
##
18-
## C Flags
15+
+
16+
if(NOT SYSTEMD_DIR)
17+
- set(SYSTEMD_DIR /lib/systemd/system)
18+
+ set(SYSTEMD_DIR /usr/sgug/lib/systemd/system)
19+
endif()

0 commit comments

Comments
 (0)