Commit 61fd2d57c28c2d6e5ba374fd907c797ac0074291
1 parent
b640e0e7
Exists in
master
and in
5 other branches
rpmlint reclamou da instalação de plugins em /usr/share; movendo-os para %{_libdir}
Showing
5 changed files
with
22 additions
and
10 deletions
Show diff stats
pw3270.spec.in
... | ... | @@ -131,7 +131,7 @@ autoconf |
131 | 131 | export CFLAGS="$RPM_OPT_FLAGS" |
132 | 132 | export CXXFLAGS="$RPM_OPT_FLAGS" |
133 | 133 | export FFLAGS="$RPM_OPT_FLAGS" |
134 | -%configure | |
134 | +%configure | |
135 | 135 | |
136 | 136 | %build |
137 | 137 | make clean |
... | ... | @@ -188,7 +188,7 @@ rm -rf $RPM_BUILD_ROOT |
188 | 188 | %{_datadir}/@PACKAGE_NAME@/sample/* |
189 | 189 | |
190 | 190 | %files plugin-dbus |
191 | -%{_datadir}/@PACKAGE_NAME@/plugins/dbus3270.so | |
191 | +%{_libdir}/@PACKAGE_NAME@-plugins/dbus3270.so | |
192 | 192 | |
193 | 193 | #---[ Scripts ]------------------------------------------------------------------------------------------------------- |
194 | 194 | ... | ... |
src/plugins/dbus3270/Makefile.in
... | ... | @@ -135,8 +135,8 @@ $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $ |
135 | 135 | #---[ Misc targets ]----------------------------------------------------------- |
136 | 136 | |
137 | 137 | install: $(BINRLS)/plugins/$(MODULE_NAME).so |
138 | - @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/plugins | |
139 | - @$(INSTALL_PROGRAM) $(BINRLS)/plugins/$(MODULE_NAME).so $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/plugins | |
138 | + @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins | |
139 | + @$(INSTALL_PROGRAM) $(BINRLS)/plugins/$(MODULE_NAME).so $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins | |
140 | 140 | |
141 | 141 | debug-service: $(BINDBG)/@PACKAGE_NAME@d |
142 | 142 | ... | ... |
src/pw3270/Makefile.in
... | ... | @@ -68,7 +68,7 @@ DEPENDS=*.h common/*.h uiparser/*.h v3270/*.h $(GLOBAL_DEPS) |
68 | 68 | |
69 | 69 | VALGRIND=@VALGRIND@ |
70 | 70 | |
71 | -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -I../../src/include | |
71 | +CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DLIBDIR=\"$(libdir)\" -DDATAROOTDIR=\"$(datarootdir)\" -I../../src/include | |
72 | 72 | LIBS=@LIBS@ @GTK_LIBS@ @GTKMAC_LIBS@ |
73 | 73 | |
74 | 74 | #---[ Rules ]------------------------------------------------------------------ | ... | ... |
src/pw3270/plugin.c
... | ... | @@ -137,9 +137,22 @@ |
137 | 137 | { |
138 | 138 | #if ! defined(DEBUG) |
139 | 139 | |
140 | - gchar *path = pw3270_build_filename(widget,"plugins",NULL); | |
141 | - load(path, widget); | |
142 | - g_free(path); | |
140 | + const gchar * appname[] = { g_get_application_name(), PACKAGE_NAME }; | |
141 | + int f; | |
142 | + | |
143 | + for(f=0;f<G_N_ELEMENTS(appname);f++) | |
144 | + { | |
145 | + gchar *path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s-plugins",LIBDIR,appname[f]); | |
146 | + | |
147 | + if(g_file_test(path,G_FILE_TEST_IS_DIR)) | |
148 | + { | |
149 | + load(path, widget); | |
150 | + g_free(path); | |
151 | + return; | |
152 | + } | |
153 | + | |
154 | + g_free(path); | |
155 | + } | |
143 | 156 | |
144 | 157 | #elif defined( win32 ) |
145 | 158 | |
... | ... | @@ -166,7 +179,6 @@ |
166 | 179 | g_free(dir); |
167 | 180 | |
168 | 181 | #endif |
169 | - | |
170 | 182 | } |
171 | 183 | |
172 | 184 | LIB3270_EXPORT void pw3270_deinit_plugins(GtkWidget *widget) | ... | ... |
src/sample/Makefile.in
... | ... | @@ -3,7 +3,7 @@ |
3 | 3 | # (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a |
4 | 4 | # aplicativos mainframe. Registro no INPI sob o nome G3270. |
5 | 5 | # |
6 | -# Copyright (C) <2008> <Banco do Brasil S.A.> | |
6 | +# Copyright (C) <2008> <Banco do Brasil S.A.> | |
7 | 7 | # |
8 | 8 | # Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob |
9 | 9 | # os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela | ... | ... |