Explorar el Código

Fix bugs in makefile/specfile

Andy Baugh hace 5 años
padre
commit
9053b23933
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 1 1
      Makefile
  2. 3 3
      SPECS/BetterPostgres.spec

+ 1 - 1
Makefile

@@ -11,7 +11,7 @@ all: install register
 
 install:
 	mkdir -p $(DESTDIR)$(ulc)$(tmpl)/ui $(DESTDIR)$(ulc)$(tmpl)/config $(DESTDIR)$(ulc)$(cgi)/js $(DESTDIR)$(ulc)$(cgi)/img $(DESTDIR)$(vcp)/Troglodyne/CGI $(DESTDIR)$(vcp)/Troglodyne/API $(DESTDIR)$(vca) $(DESTDIR)$(vct)/troglodyne/config
-	install $(pwd)/templates/ui/pgupgrade.tmpl $(DESTDIR)$(ulc)$(tmpl)/ui
+	install $(pwd)/templates/ui/pgupgrade.tmpl $(DESTDIR)$(ulc)$(tmpl)
 	install $(pwd)/templates/config/main.default $(DESTDIR)$(vct)/troglodyne/config
 	install $(pwd)/js/pgupgrade.js $(DESTDIR)$(ulc)$(cgi)/js
 	install $(pwd)/img/troglophant.png $(DESTDIR)$(ulc)$(cgi)/img

+ 3 - 3
SPECS/BetterPostgres.spec

@@ -31,11 +31,11 @@ make install DESTDIR=%{buildroot}
 %defattr(0700,root,root,-)
 /usr/local/cpanel/whostmgr/docroot/cgi/troglodyne/pgupgrade.cgi
 /usr/local/cpanel/whostmgr/docroot/cgi/troglodyne/api.cgi
-%defattr(0600,root,root,-)
-/usr/local/cpanel/whostmgr/docroot/templates/troglodyne/ui/pgupgrade.tmpl
+/usr/local/cpanel/whostmgr/docroot/templates/troglodyne/pgupgrade.tmpl
 /var/cpanel/templates/troglodyne/config/main.default
 /usr/local/cpanel/whostmgr/docroot/cgi/troglodyne/js/pgupgrade.js
 /usr/local/cpanel/whostmgr/docroot/cgi/troglodyne/img/troglophant.png
+%defattr(0600,root,root,-)
 /var/cpanel/perl/Troglodyne/CGI/PgUpgrade.pm
 /var/cpanel/perl/Troglodyne/CGI/API.pm
 /var/cpanel/perl/Troglodyne/CpPostgreSQL.pm
@@ -45,7 +45,7 @@ make install DESTDIR=%{buildroot}
 /var/cpanel/apps/troglodyne_api.conf
 /var/cpanel/apps/better_postgres.conf
 
-%pre
+%preun
 /usr/local/cpanel/bin/unregister_appconfig troglodyne_api
 /usr/local/cpanel/bin/unregister_appconfig better_postgres